-
Notifications
You must be signed in to change notification settings - Fork 21
skpkg: change version build file. #151
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
Conversation
|
@sbillinge I also commit the |
sbillinge
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please see comments.
| @@ -1,12 +1,8 @@ | |||
| import io | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we want the version of conftest.py from the original, not from skpkg
| #!/usr/bin/env python | ||
|
|
||
| # Extensions script for diffpy.pdffit2 | ||
| """PDFfit2 - real space structure refinement engine |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we also want the original version of setup.py and not anything added by skpkg. This is needed because we are building c-code in this package.
|
@sbillinge The CI fails because of the incompatibility in here it needs to import the |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## migration #151 +/- ##
==========================================
Coverage 98.97% 98.97%
==========================================
Files 6 6
Lines 1267 1270 +3
==========================================
+ Hits 1254 1257 +3
Misses 13 13
🚀 New features to boost your workflow:
|
| ############################################################################## | ||
| """PDFfit2 - real space structure refinement program.""" | ||
|
|
||
| # WARNING: Do NOT remove the isort: off/on comments in this file. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to keep the old code in this module
@sbillinge Ready to a first round review. Note that the file that still needs to be in the next PR are
setup.pyandtests/conftest.pyand I'm not sure where the edits made bypackage updatebreaks the test on my local.which is the same as the breaking CI here. Something that automatically deleted must break the import of the file.