Skip to content
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

Fix docker action so that it can run test_version.py #298

Draft
wants to merge 37 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
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 Jul 26, 2022
3ef7582
box widget methods
lauramurgatroyd Jul 27, 2022
830fff9
test preveting selection
lauramurgatroyd Jul 27, 2022
63dc571
rename
lauramurgatroyd Jul 27, 2022
3d1df1a
Automated autoyapf fixes
invalid-email-address Jul 27, 2022
10ffdfb
Add separate method for getting coordinates for box widget around slice
lauramurgatroyd Jul 27, 2022
91c07c6
Merge branch 'box_widget' of https://github.com/vais-ral/CILViewer in…
lauramurgatroyd Jul 27, 2022
20f0fc0
Automated autoyapf fixes
invalid-email-address Jul 27, 2022
1d741ec
Merge branch 'master' into box_widget
lauramurgatroyd Aug 1, 2022
ac09b3a
Restructure into classes for box and line widgets
lauramurgatroyd Aug 3, 2022
7035618
Automated autoyapf fixes
invalid-email-address Aug 3, 2022
05fe087
Reinstate 'Create' in names
lauramurgatroyd Aug 3, 2022
b26e35f
Automated autoyapf fixes
invalid-email-address Aug 3, 2022
6717444
correction in docstring
lauramurgatroyd Aug 3, 2022
9bd1477
change behaviour of scale factor in truncation
lauramurgatroyd Aug 3, 2022
7a44312
Automated autoyapf fixes
invalid-email-address Aug 3, 2022
6470e89
Tidy imports
lauramurgatroyd Aug 3, 2022
47565bd
no longer exclude test version
lauramurgatroyd Aug 3, 2022
34daba1
Add dependencies for ccpi.viewer
lauramurgatroyd Aug 3, 2022
4450e8d
add channels
lauramurgatroyd Aug 3, 2022
115cc14
remove cil-data and pytest install from action file
lauramurgatroyd Aug 3, 2022
ea07bd3
Add pytest to environment.yml
lauramurgatroyd Aug 3, 2022
35b890a
print contents of ccpi/viewer folder to check for version file
lauramurgatroyd Aug 3, 2022
7a05b05
try to print where ccpi-viewer package is installed
lauramurgatroyd Aug 3, 2022
4f191e0
change directory where test happens
lauramurgatroyd Aug 3, 2022
17db259
change file for tests
lauramurgatroyd Aug 3, 2022
2c91f6f
print contents of installed ccpi viewer folder
lauramurgatroyd Aug 3, 2022
19f617f
Merge branch 'docker_version_test' of https://github.com/vais-ral/CIL…
lauramurgatroyd Aug 3, 2022
e1ef7c6
fix path to test
lauramurgatroyd Aug 3, 2022
0e9f891
Automated autoyapf fixes
invalid-email-address Aug 3, 2022
478fb78
check file permissions
lauramurgatroyd Aug 3, 2022
78d9ed1
import version in init
lauramurgatroyd Aug 3, 2022
2748865
revert import
lauramurgatroyd Aug 4, 2022
e8b8f33
Merge branch 'master' into docker_version_test
lauramurgatroyd Aug 4, 2022
2fabf26
Update Wrappers/Python/ccpi/viewer/widgets/box_widgets.py
lauramurgatroyd Aug 4, 2022
4b72ac6
Update Wrappers/Python/ccpi/viewer/widgets/box_widgets.py
lauramurgatroyd Aug 4, 2022
4a8a5ad
add step to create and upload artifact of image
lauramurgatroyd Aug 10, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker_build_test_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ jobs:
- name: Run docker container with tests
shell: bash -l {0}
run: |
docker run --rm --entrypoint /bin/bash -v /home/runner/work/CILViewer/CILViewer:/root/source_code cil-viewer -c "source ./mambaforge/etc/profile.d/conda.sh && conda activate cilviewer_webapp && conda install cil-data pytest -c ccpi && python -m pytest /root/source_code/Wrappers/Python -k 'not test_version'"
# TODO: publish to come later
docker run --rm --entrypoint /bin/bash -v /home/runner/work/CILViewer/CILViewer:/root/source_code cil-viewer -c "source ./mambaforge/etc/profile.d/conda.sh && conda activate cilviewer_webapp && python -m pytest /root/source_code/Wrappers/Python"
lauramurgatroyd marked this conversation as resolved.
Show resolved Hide resolved
# TODO: publish to come later
10 changes: 9 additions & 1 deletion docker/web-app/environment.yml
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