-
Notifications
You must be signed in to change notification settings - Fork 12
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
Porting hazen to python 3.9 #143
Merged
Merged
Changes from 4 commits
Commits
Show all changes
72 commits
Select commit
Hold shift + click to select a range
a214d3d
Adds WIP miniforge environment.yml - builds hazen in 3.9, but 23 test…
tomaroberts add45f8
Fix .astype(int) causing error
tomaroberts 7dc6c48
Remove superfluous commented lines.
tomaroberts 866dc22
Alters findContours syntax - spatial_resolution function now outputs
tomaroberts 67f03cf
Adds env.yml for testing matplotlib version
tomaroberts 3f65bb7
Adds env.yml for testing old opencv version
tomaroberts bd14c80
Adds requirements.txt for testing Docker hazen3.6 with latest numpy
tomaroberts f241076
Correct for 90 degree rotation of square/rectangles
tomaroberts e4ca073
Amend tests to reflect 90 degree rotation of square/rectangles
tomaroberts 30e2d10
Adjusts hazen code to account for cv.minAreaRect() changes between Op…
tomaroberts 74e9d8f
Create tests_development_py3.9.yml
tomaroberts 1629d08
Update test_spatial_resolution to reflect new OpenCV version values
tomaroberts a130416
Update tests_development_py3.9.yml
tomaroberts c6a40f1
Update tests_development_py3.9.yml
tomaroberts 58a773c
Update tests_development_py3.9.yml
tomaroberts ce38a1a
Update tests_development_py3.9.yml
tomaroberts d486335
Update tests_development_py3.9.yml
tomaroberts 0dd3646
Update tests_development_py3.9.yml
tomaroberts 20db76a
Update tests_development_py3.9.yml
tomaroberts 141be57
Update tests_development_py3.9.yml
tomaroberts 4c37ef5
Update tests_development_py3.9.yml
tomaroberts c8a5fe1
Update tests_development_py3.9.yml
tomaroberts 6832cb1
Update tests_development_py3.9.yml
tomaroberts fab1169
Update tests_development_py3.9.yml
tomaroberts 75b3d73
Update tests_development_py3.9.yml
tomaroberts 8862afe
Testing
tomaroberts 06c7473
Testing
tomaroberts 7c17690
Testing
tomaroberts eeac324
Test install any psycopg2-binary version
tomaroberts 8394ae7
Try build with psycopg2-binary removed from env.yml
tomaroberts 599c17c
Test install psycopg2-binary via pip section in env.yml
tomaroberts 017a4bf
Testing
tomaroberts 139a8b6
Adds default bash shell to .yml
tomaroberts dd348a9
Update werkzeug version for Actions testing
tomaroberts 60ad5fd
Remove old tests_development.yml / replace with finalised python3.9 v…
tomaroberts f9aa2f0
wip: Updating README.md
tomaroberts cb3f154
Remove old WIP files
tomaroberts 7ae24e6
Update requirements.txt - will not work on M1 / to be tested on other…
tomaroberts d25f0be
Bugfix: missing = sign
tomaroberts 238d39b
Changed GitHub Actions to python 3.9
tomaroberts 2ca01a3
Revert .astype(int) change
tomaroberts 3cadc1d
Adds Ibn Al-Haytham image
tomaroberts f1b2f91
Revert "Revert .astype(int) change"
tomaroberts 6fdf4fe
Add snr/ghosting example images to assets
tomaroberts 4c4488a
Update README.md
tomaroberts 9e6f7e5
Make horizontal lines consistent
tomaroberts ad6a085
Adds enhance version of Ibn
tomaroberts d62e953
setuptools & wheel required so opencv install works
tomaroberts 1c47ba4
Revert "Adds enhance version of Ibn"
tomaroberts fc2f215
Adds assert_allclose to shape tests / removes round_tuple
tomaroberts 8450728
Merge branch 'readme-dev' into hazen-3.9-miniforge
tomaroberts 5ba9d59
Update Git workflows python to v3.9.7
tomaroberts 06caf01
m2r package hotfix
tomaroberts a90cea1
m2r version change test
tomaroberts 2156519
mistune<2.0.0 test
tomaroberts fa390d3
Changes workflows versions to python 3.9
tomaroberts c8e9d63
Update test_development.yml with os/python matrix
tomaroberts 0f53026
Indentation fix
tomaroberts d990adf
Remove macos from matrix (for now)
tomaroberts 408de45
Remove specific python version from env.yml
tomaroberts 16d6610
python 3.9 - os.matrix test
tomaroberts f9adb8c
os.matrix python3.10 test
tomaroberts 65c20cb
Adds auto-update-conda, remove client-env, base true
tomaroberts fd7949e
Remove conda – test workflows with python3.9
tomaroberts 3e7612a
Try os.matrix macos / python versions
tomaroberts cef5417
Drop macos from tests
tomaroberts 72064a9
Remove scikit / numpy exact versions
tomaroberts ca99266
Update cli-test / tests_release
tomaroberts 4bca6b1
Adds pip list for debugging
tomaroberts 043c278
Update requirements.txt with fixed versions
tomaroberts 43ba38f
Update README.md – important addition of openssl instructions
tomaroberts 1de9e1a
Merge branch 'release/0.5.0' into hazen-3.9-miniforge
tomaroberts File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
name: hazen-3.9-miniforge | ||
|
||
dependencies: | ||
- pip=21.3.1 | ||
- python=3.9.7 | ||
- scikit-image | ||
- psycopg2-binary | ||
- pip: | ||
- SQLAlchemy_Utils==0.33.11 | ||
- alembic==1.0.10 | ||
- celery==4.3.1 | ||
- numpy==1.21.0 | ||
- Werkzeug==0.15.4 | ||
- opencv-python==4.5.4.58 | ||
- Flask_Migrate==2.5.1 | ||
- pytest>=6.2 | ||
- coverage>=6.0.2 | ||
- Flask_Moment==0.7.0 | ||
- flask_heroku==0.1.9 | ||
- Flask==1.0.3 | ||
- pydicom==1.4.1 | ||
- WTForms==2.2.1 | ||
- Flask_Dropzone==1.5.3 | ||
- Flask_Mail==0.9.1 | ||
- Flask_Login==0.4.1 | ||
- Flask_Bootstrap4==4.0.2 | ||
- imutils==0.5.3 | ||
- matplotlib==3.4.3 | ||
- Flask_SQLAlchemy==2.4.0 | ||
- scipy==1.7.2 | ||
- docopt==0.6.2 | ||
- SQLAlchemy==1.3.3 | ||
- Flask_WTF==0.14.2 | ||
- flask_bootstrap==3.3.7.1 | ||
- PyJWT==1.7.1 | ||
- gunicorn==19.9.0 | ||
# - psycopg2-binary==2.8.4 | ||
- arrow==0.13.2 | ||
- amqp==2.4.2 | ||
- sphinxcontrib-needs==0.4.3 | ||
- sphinxcontrib-napoleon | ||
- sphinx_rtd_theme | ||
- m2r | ||
- python-dateutil | ||
- email_validator | ||
- colorlog | ||
|
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
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.
What does this file do?
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.
Sorry, shouldn't have spread between two places. Bit more context in #142.
Basically, installing some of our libraries (mainly scikit-image) doesnt work on M1 silicon via pip. So instead I made the venv in miniforge (just a smaller version of conda). The environment.yml is the equivalent to our normal requirements.txt.
I specifically made most of it install via pip anyway, so it was easy to see which ones work via pip and which only work via conda.
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.
Sorry for being a bit slow here. But doesn't the dockerisation of Hazen make this issue a moot point?
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.
Sorry I should have made this comment on the issue when you first raised it.