Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport changes to 3.0 branch for Python 3.12 and NumPy 2.0 support #1719

Merged
merged 22 commits into from
Jun 23, 2024

Conversation

bryanwweber
Copy link
Member

@bryanwweber bryanwweber commented Jun 21, 2024

Changes proposed in this pull request

  • Backport relevant changes from main to 3.0 to support Python 3.12 and NumPy 2.0

Checklist

  • The pull request includes a clear description of this code change
  • Commit messages have short titles and reference relevant issues
  • Build passes (scons build & scons test) and unit tests address code coverage
  • Style & formatting of contributed code follows contributing guidelines
  • The pull request is ready for review

mefuller and others added 14 commits June 21, 2024 12:13
build 1.0 comes with multiple breaking changes
Eliminates the confusing "python_sdist=yes" option

Resolves Cantera#1678
When building the sdist via scons, the cython step was running twice because of the conditional. In addition, we were getting a warning about building the extension from multiple source files. These changes resolve both problems by cythonizing once if the files aren't present and only including the C++ sources in the extension.
NumPy 2.0 does not support Python 3.8, so we need to special case that version.
Update dependencies for Cython/Sdist packages
@bryanwweber bryanwweber force-pushed the bryan-backport-numpy2-and-py312 branch from 3adcfb0 to 2696444 Compare June 21, 2024 23:04
@bryanwweber bryanwweber marked this pull request as ready for review June 22, 2024 13:28
Copy link
Member

@speth speth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@speth speth merged commit 5c7a0a0 into Cantera:3.0 Jun 23, 2024
34 of 39 checks passed
@bryanwweber bryanwweber deleted the bryan-backport-numpy2-and-py312 branch June 23, 2024 02:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants