-
Notifications
You must be signed in to change notification settings - Fork 7
Fix docker action so that it can run test_version.py #298
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
Draft
lauramurgatroyd
wants to merge
37
commits into
master
Choose a base branch
from
docker_version_test
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 5 commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
68e2b77
Add border widget and example
lauramurgatroyd 3ef7582
box widget methods
lauramurgatroyd 830fff9
test preveting selection
lauramurgatroyd 63dc571
rename
lauramurgatroyd 3d1df1a
Automated autoyapf fixes
invalid-email-address 10ffdfb
Add separate method for getting coordinates for box widget around slice
lauramurgatroyd 91c07c6
Merge branch 'box_widget' of https://github.com/vais-ral/CILViewer in…
lauramurgatroyd 20f0fc0
Automated autoyapf fixes
invalid-email-address 1d741ec
Merge branch 'master' into box_widget
lauramurgatroyd ac09b3a
Restructure into classes for box and line widgets
lauramurgatroyd 7035618
Automated autoyapf fixes
invalid-email-address 05fe087
Reinstate 'Create' in names
lauramurgatroyd b26e35f
Automated autoyapf fixes
invalid-email-address 6717444
correction in docstring
lauramurgatroyd 9bd1477
change behaviour of scale factor in truncation
lauramurgatroyd 7a44312
Automated autoyapf fixes
invalid-email-address 6470e89
Tidy imports
lauramurgatroyd 47565bd
no longer exclude test version
lauramurgatroyd 34daba1
Add dependencies for ccpi.viewer
lauramurgatroyd 4450e8d
add channels
lauramurgatroyd 115cc14
remove cil-data and pytest install from action file
lauramurgatroyd ea07bd3
Add pytest to environment.yml
lauramurgatroyd 35b890a
print contents of ccpi/viewer folder to check for version file
lauramurgatroyd 7a05b05
try to print where ccpi-viewer package is installed
lauramurgatroyd 4f191e0
change directory where test happens
lauramurgatroyd 17db259
change file for tests
lauramurgatroyd 2c91f6f
print contents of installed ccpi viewer folder
lauramurgatroyd 19f617f
Merge branch 'docker_version_test' of https://github.com/vais-ral/CIL…
lauramurgatroyd e1ef7c6
fix path to test
lauramurgatroyd 0e9f891
Automated autoyapf fixes
invalid-email-address 478fb78
check file permissions
lauramurgatroyd 78d9ed1
import version in init
lauramurgatroyd 2748865
revert import
lauramurgatroyd e8b8f33
Merge branch 'master' into docker_version_test
lauramurgatroyd 2fabf26
Update Wrappers/Python/ccpi/viewer/widgets/box_widgets.py
lauramurgatroyd 4b72ac6
Update Wrappers/Python/ccpi/viewer/widgets/box_widgets.py
lauramurgatroyd 4a8a5ad
add step to create and upload artifact of image
lauramurgatroyd 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,12 +1,20 @@ | ||
| name: cilviewer_webapp | ||
| channels: | ||
| - conda-forge | ||
| - ccpi | ||
| - paskino | ||
| dependencies: | ||
| - python==3.9 | ||
| - matplotlib # Optional for more colormaps | ||
| - h5py | ||
| - numpy | ||
| - pyside2 | ||
| - paskino::eqt | ||
| - importlib_metadata # [py<38] | ||
| - ccpi::cil-data >=22.0.0 | ||
lauramurgatroyd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| - pytest | ||
| - pip | ||
| - pip: | ||
| # Have to install Trame via pip due to unavailability on conda | ||
| - trame <3, >=2.1.1 # Unpinned worked with version 2.1.1, should work with higher versions. | ||
| - vtk==9.1 | ||
| - vtk==9.1 | ||
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.
Uh oh!
There was an error while loading. Please reload this page.