-
Notifications
You must be signed in to change notification settings - Fork 206
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
ENH-FIX: change distutils to setuptools and add flexible cythonization #949
Merged
Merged
Changes from 1 commit
Commits
Show all changes
121 commits
Select commit
Hold shift + click to select a range
243c27e
ENH-FIX: change distutils to setuptools
sem-geologist d57a62e
add-fix: Extension bits
sem-geologist 883097d
fix import syntax
sem-geologist 8d64a71
fix...
sem-geologist 6687513
fix: setuptools vs distutils
sem-geologist a83d692
Create test_cython_integration.pyx
sem-geologist ba3a222
add: initial cythonization code piece
sem-geologist ef8e478
enh: add working cythonization for install
sem-geologist 1224d5c
fix: mising extensions global dict declaration
sem-geologist 2ec5b8a
fix: add missing self to run()
sem-geologist 340b769
fix: add finalize_options
sem-geologist 1d3e026
mv-fix: cython building implementation
sem-geologist f1b4a56
add: cython dependency to travis and appveyor
sem-geologist 621df25
add-mv: testing of cythonization
sem-geologist 3528437
add: git post-checkout hook generator
sem-geologist 6f35683
add: *.so to gitignore
sem-geologist b3a1f47
Update install.rst
sem-geologist 259f72b
fix: git hook generator to remove old .c* and .so/.pyd
sem-geologist 2d7f966
cleanup
sem-geologist d0834ce
Merge branch 'patch-2' of https://github.com/sem-geologist/hyperspy i…
sem-geologist 34bfd3f
fix: apply suggested fixes to test_cython.py
sem-geologist 751442e
fix-add: make post-checkout generator controlable
sem-geologist ad5c848
fix: add '\n before rm list
sem-geologist 6b6fcc6
fix-add: .hook_ignore to .gitignore
sem-geologist 058599b
fix: update test error messages
sem-geologist 8ee89db
remove added documentation to different pull req..
sem-geologist 2fb174a
fix-add: add include *.pyx to MANIFEST.in
sem-geologist 400f93c
Merge branch 'patch-2' of https://github.com/sem-geologist/hyperspy i…
sem-geologist 38c1bfb
fix-rm: remove_tree('build')
sem-geologist d0cea75
fix: changed the test_cythonization error msg
sem-geologist 26be419
fix-add: generate cleanup list according to OS
sem-geologist ebd0cda
hmm: trial to enable bdist_wheel
sem-geologist cb575e6
fix-rev: revert back, and try other appveyor options
sem-geologist 27a7de3
fix-test: fix and another try of bdist_wheel
sem-geologist f5adf40
test: travis osx trial#1
sem-geologist cb541b3
test: travis-osx trial#2
sem-geologist 1cd8d4a
test: travis osx trial#3
sem-geologist b82b40a
test: travis osx trial #4
sem-geologist 2290570
test: travis osx trial#5
sem-geologist 0f5003b
test travis osx trial#6
sem-geologist db47790
test: travis osx ...
sem-geologist 74a1b5c
fix: travis osx -- add to allow_failure
sem-geologist b76f582
fix: add back the fail_on_external...True
sem-geologist 69097df
fix: osx, add missing fi in /travis.yml
sem-geologist 8015021
fix: osx travis build_wheel to bdist_wheel
sem-geologist 4d55caf
test: add --verbose to nosetest
sem-geologist e660e09
test: comment out TestLoadingOOReadOnly
sem-geologist da40b9d
fix: remove osx from allow_failures in .travis.yml
sem-geologist 6c05441
test: uncomment part of test commented before
sem-geologist 451ce9f
test: uncomenting more
sem-geologist a635b2a
fix: test changes to comply with osx
sem-geologist bf1f553
test osx, memory
sem-geologist 5ce4107
test osx
sem-geologist 05a22e9
test osx
sem-geologist 80d1f19
test osx
sem-geologist 8479e01
test osx
sem-geologist 0fea97d
test osx
sem-geologist 4b15bbf
cleanup
sem-geologist 78811e7
remove --verbose from CI
sem-geologist ef8c3e7
fix: strict up path in setup.py
sem-geologist 7093dae
blind mans blind try of release
sem-geologist 3dc1442
update token
sem-geologist 19d59ad
try: travis on release build sdist and bdist(osx)
sem-geologist 627e792
travis fix?
sem-geologist 0ce6ee5
test: travis fix?
sem-geologist 65d908e
update travis.yml
sem-geologist 218485c
fix travis.yml
sem-geologist cb8fc15
fix: travis releases test
sem-geologist dbfcb01
fix: travis
sem-geologist 085625c
fix-add: to travis.yml deploy
sem-geologist 2a24a7a
fix: ci release encrypted keys
sem-geologist 1cca1bd
fix: comment out winpython
sem-geologist 35b5df5
update: oauth key
sem-geologist 5887321
try: dissable some parts of appveoyr
sem-geologist 394f375
test: appveoyr release
sem-geologist 9716844
try: adding branch and repo to appveoyr
sem-geologist 4321198
rm: branch and repo from appvoyr yml
sem-geologist 77f206f
rm: obsolete commented import
sem-geologist 6618482
rm: describtion for release in
sem-geologist 8a53140
fix-conflict with upstream
sem-geologist a971090
Merge pull request #6 from hyperspy/master
sem-geologist c711cef
change appveoyr.yml
sem-geologist f25a687
Merge branch 'patch-2' of https://github.com/sem-geologist/hyperspy i…
sem-geologist ec527d7
fix: uncomented comment
sem-geologist cb385ef
appveyor change
sem-geologist 0eae46d
Merge remote-tracking branch 'upstream/master' into patch-2
sem-geologist 34e9ba4
fix: travis on osx
sem-geologist 46abb24
appveyor.yml cleanup
sem-geologist 22b3147
rm: osx on depr. from travis matrix
sem-geologist 22cb583
try: appvayor->force_update
sem-geologist 830ff4c
temp disable winpython nsis in appveyor
sem-geologist 8f8464d
rm: comma at setup.py->classifiers
sem-geologist 3f4270d
uncomment appveyor winpython build
sem-geologist e9a66a4
try: add recythonize command before building
sem-geologist 4c45c2e
bring back the comma, as removal
sem-geologist b6bee5b
fix: path issue in setup.py
sem-geologist 70e9e2c
add visual studio :O
sem-geologist 4ac6703
add: one liner to check winpython version
sem-geologist fe42722
fix oneliner
sem-geologist 563a0be
add oneliner to anaconda python
sem-geologist 028575a
try: removing pydistutils.cfg at winpython
sem-geologist 2f58e24
fix: rem pydistutils
sem-geologist 3c22b61
fix: leftovers of bad path
sem-geologist ff89fda
fix typo
sem-geologist 04c903c
Update appveyor.yml
sem-geologist 0f49385
try: fixing ps syntacs
sem-geologist 4559fc1
fix: backslash to forwardslash arghhh...
sem-geologist ad8ee54
add minimal c c file
sem-geologist eff404c
add: compiler presence checker
sem-geologist 87e652e
temp-test: comment out fixing compiler
sem-geologist 26d6185
fix: typo
sem-geologist 593eb24
fix: typo
sem-geologist 0fb1219
fix: setup.py
sem-geologist f70026b
mv: test_compilers.c
sem-geologist d1c6f90
Merge pull request #8 from sem-geologist/release_test
sem-geologist 1135d65
Rename hyperspy/tests/misc/test_compilers.c to hyperspy/misc/etc/test…
sem-geologist fa242a3
fix dummy c file path
sem-geologist cd6a213
Update MANIFEST.in
sem-geologist 812473e
Merge pull request #10 from hyperspy/master
sem-geologist 4f0e28f
fix: del to rem
sem-geologist 232e795
add missing DistutilPlatformError catching
sem-geologist File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Why waiting 10 s? As the user has to take no action I would simply print the warning and continue...
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.
if terminal used have some limit (often 1000 lines, by default) it "flies" away. this will wait for 10 sec only if compiler is missing. if it is here, no waiting.
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.
And I have results from winpython... it is bad, no matter to what extensions are set (empty list or None) if keyword
ext_modules
is provided tosetup()
then winpython anyway tries to fire up compiler :/. So I don't know what to do now as it is "impossible" to trick winpython from touching compiler.