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

Add safeguards against Python 3.12 #1467

Merged
merged 1 commit into from
Apr 1, 2023
Merged

Conversation

ischoegl
Copy link
Member

@ischoegl ischoegl commented Mar 26, 2023

Changes proposed in this pull request

Implement safeguards against Python 3.12 in main; the PR replicates similar changes implemented in #1465 for updates of Cantera 2.6. Edit: added a check in SCons to abort attempts that will fail before compiling.

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

@ischoegl ischoegl mentioned this pull request Mar 26, 2023
@ischoegl ischoegl force-pushed the pypi-safegards branch 5 times, most recently from 469e3d7 to 32a19f2 Compare March 26, 2023 02:55
@ischoegl ischoegl requested a review from a team March 26, 2023 03:16
Copy link
Member

@bryanwweber bryanwweber left a comment

Choose a reason for hiding this comment

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

Thanks Ingmar! Couple of comments

SConstruct Outdated Show resolved Hide resolved
SConstruct Outdated Show resolved Hide resolved
@ischoegl

This comment was marked as resolved.

@ischoegl ischoegl force-pushed the pypi-safegards branch 4 times, most recently from 09a7540 to 31fcc47 Compare March 27, 2023 11:59
@ischoegl
Copy link
Member Author

ischoegl commented Mar 27, 2023

@bryanwweber ... thanks for your comments. Based on feedback, I updated the approach and am now conditioning behavior on the python_sdist and package_build flags: if False, there is only a warning as suggested; if it is True, SCons exits with an error. Also, the safeguards against newer Python versions in setup.cfg are only applied for packaged builds (Edit: there is a pending push, but GH currently has partial outages.).

@ischoegl ischoegl force-pushed the pypi-safegards branch 3 times, most recently from 54fc968 to e9812f3 Compare March 27, 2023 13:34
@bryanwweber
Copy link
Member

Thanks for the change @ischoegl! I had one small nitpick from my previous review.

@ischoegl
Copy link
Member Author

@bryanwweber … I believe that all comments are addressed.

Copy link
Member

@bryanwweber bryanwweber left a comment

Choose a reason for hiding this comment

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

Thanks @ischoegl LGTM. One question for my own edification 😄

SConstruct Show resolved Hide resolved
@ischoegl ischoegl merged commit 5e04031 into Cantera:main Apr 1, 2023
@ischoegl ischoegl deleted the pypi-safegards branch April 1, 2023 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

2 participants