merge master into dev-milestone #82
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Prepare for `1.3.0` release
…ackage-workflow Drop Python 3.9 and bump NumPy versions in conda-package workflow
Update CODEOWNERS
jharlow-intel
requested review from
antonwolfy,
ekomarova,
ndgrigorian and
xaleryb
as code owners
Collaborator
Author
|
changelog conflict 🤔 |
antonwolfy
reviewed
Nov 12, 2025
conda-recipe-cf/meta.yaml
Outdated
| @@ -1,4 +1,4 @@ | |||
| {% set version = "1.3.0dev0" %} | |||
| {% set version = "1.3.0" %} | |||
Collaborator
There was a problem hiding this comment.
I believe we need to bump the version to 1.4.0dev0 on the master branch first.
Collaborator
Author
There was a problem hiding this comment.
seems we made several more conflicts haha. I will fix them locally
Collaborator
Author
|
did the merge and resolved the conflicts locally, wasn't thinking about how that would automatically close this PR and skip the CI checks... I'll make sure the package looks good for the internal CI though |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merging master into dev-milestone to enable 3.14 internal CI builds