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

Move Python examples to standard location #1352

Merged
merged 2 commits into from Aug 6, 2022

Conversation

ischoegl
Copy link
Member

@ischoegl ischoegl commented Aug 4, 2022

Changes proposed in this pull request

Move Python examples to standard sample location, i.e. samples/python

If applicable, fill in the issue number this pull request is fixing

Closes #1348

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

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.

I think setup.cfg.in needs to remove the cantera.examples module from package_data, I think the cantera/examples/README.txt will be included by a different setting there.

interfaces/cython/SConstruct also can remove the dependency checks for */*/.py

doc/example-keywords.py Outdated Show resolved Hide resolved
@ischoegl ischoegl force-pushed the move-python-examples branch 2 times, most recently from e36aa02 to 03649d7 Compare August 4, 2022 15:07
@ischoegl
Copy link
Member Author

ischoegl commented Aug 4, 2022

@bryanwweber - thanks for the prompt feedback! Finally figured out that README.txt wasn't automatically copied into the build folder, but I think things work now.

@ischoegl ischoegl force-pushed the move-python-examples branch 2 times, most recently from f25e125 to 3fa0344 Compare August 4, 2022 19:29
@ischoegl
Copy link
Member Author

ischoegl commented Aug 4, 2022

… can remove the dependency checks for */*/.py

@bryanwweber … I put these checks back in as they should cover test while this is still packaged? (Edit: But I am removing them with #1354)

@ischoegl ischoegl mentioned this pull request Aug 6, 2022
5 tasks
@ischoegl ischoegl force-pushed the move-python-examples branch 2 times, most recently from cda22be to 4f34c31 Compare August 6, 2022 17:53
@ischoegl ischoegl requested a review from speth August 6, 2022 18:12
@speth
Copy link
Member

speth commented Aug 6, 2022

Sorry, I didn't realize merging #1354 would create merge conflicts here (or maybe the conflicts were inevitable, regardless of the ordering?).

@ischoegl
Copy link
Member Author

ischoegl commented Aug 6, 2022

Sorry, I didn't realize merging #1354 would create merge conflicts here (or maybe the conflicts were inevitable, regardless of the ordering?).

@speth ... no worries. Merge conflicts were inevitable - and are already fixed. None of the actual content changed (other than including test/README.txt in the sdist wheel (which I forgot to add in #1354)

@ischoegl ischoegl marked this pull request as draft August 6, 2022 19:50
@ischoegl ischoegl marked this pull request as ready for review August 6, 2022 21:14
@ischoegl
Copy link
Member Author

ischoegl commented Aug 6, 2022

Examples are now properly installed - I think this is ready now.

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.

Thanks, @ischoegl. This looks good to me.

@ischoegl ischoegl merged commit b35ed2f into Cantera:main Aug 6, 2022
@ischoegl ischoegl deleted the move-python-examples branch August 6, 2022 23:34
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.

Packaging of examples as data is deprecated
3 participants