-
Notifications
You must be signed in to change notification settings - Fork 664
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
Cythonized files now deleted after setup. (closes #667 / #629) #692
Conversation
@@ -67,6 +67,14 @@ | |||
cython_found = False | |||
cmdclass = {} | |||
|
|||
# Find our own release code (by shamelessly running MDAnalysis/version.py, | |||
# which brings the __version__ variable into the current namespace.) | |||
with open("MDAnalysis/version.py") as f: |
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.
Does this always work even when the package is installed in weird ways? Ie is MDAnalysis/version.py always there? Or would it be better to use resource_filename like we do with the test files?
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.
After I submitted I realized that this is relatively fragile (the tests' setup.py
can't do the same, for instance). It was mostly a convenience so that you'd only need to change the version string in one place. It's not even directly related to the issue at hand.
I'll revert it.
If we're removing the pyx->c files from develop, doesn't that need to be done in this PR? |
@richardjgowers It would make sense indeed. |
Duh... One important aspect: Any work branched from one of these release points carries the non-dev version string. Since this PR changes behavior based on those strings, devs might run into non-obvious inconsistencies. |
@mnmelo so that's correct, but I only ever push a dev suffixed version to No worries about the version number, 2 places is ok |
36ff92d
to
00e3c04
Compare
Ok, with that out of the way this should be done (I didn't add anything to CHANGELOG, as this is a dev-side change. Let me know if you think I should). |
There something to do with the travis build. It make no sense anymore to have a no-cython build. Having two build continue to make sense, though, to have a full and a minimal dependency builds. |
00e3c04
to
243dffb
Compare
Default behavior now depends on release or dev status. When in dev mode default is to use Cython and delete cythonized files. When in release mode default is to skip Cython but keep existing cythonized files. setup.py now reads the version string directly from version.py. Environment variable handling in setup.py enhanced to recognize strings with boolean meaning (fixes #629). Travis' minimal build now also rebuilds cythonized files.
243dffb
to
9b577f1
Compare
Default behavior now depends on release or dev status. When in dev mode
default is to use Cython and delete cythonized files. When in release
mode default is to skip Cython but keep existing cythonized files.
setup.py now reads the version string directly from version.py.
Environment variable handling in setup.py enhanced to recognize strings
with boolean meaning.
I tried to keep the burden on the release manager to a minimum:
version.py
;