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.

Sign up for GitHub

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

Jump to bottom

1040: NeXus file in mantidimaging-data #1040

Merged
merged 7 commits into from
Jul 6, 2021
Merged

1040: NeXus file in mantidimaging-data #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ad776b
nexus file in data repo
DolicaAkelloEgwel Jul 5, 2021
06e9364
Merge branch 'master' into 1039_load_nexus_test_data
DolicaAkelloEgwel Jul 5, 2021
d309c7a
Using wget and unzip
DolicaAkelloEgwel Jul 6, 2021
6c09b30
Changing paths
DolicaAkelloEgwel Jul 6, 2021
1f7b659
quiet
DolicaAkelloEgwel Jul 6, 2021
9d71532
Fixing skip test reason
DolicaAkelloEgwel Jul 6, 2021
ff9e34d
unzip location
DolicaAkelloEgwel Jul 6, 2021
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
6 changes: 3 additions & 3 deletions .github/workflows/conda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ jobs:
APPLITOOLS_BATCH_ID: ${{ github.sha }}
GITHUB_BRANCH_NAME: ${{ github.head_ref }}
run: |
git clone https://github.com/mantidproject/mantidimaging-data.git ~/mantidimaging-data
wget -O ~/mantidimaging-data/24737.nxs https://github.com/DiamondLightSource/Savu/blob/master/test_data/data/24737.nxs?raw=true
xvfb-run --auto-servernum python -m pytest -p no:xdist -p no:randomly -p no:repeat -p no:cov mantidimaging/eyes_tests
wget -nv https://github.com/mantidproject/mantidimaging-data/archive/refs/heads/master.zip
unzip -q master.zip -d ~
xvfb-run --auto-servernum python -m pytest -rs -p no:xdist -p no:randomly -p no:repeat -p no:cov mantidimaging/eyes_tests
timeout-minutes: 15

- name: Coveralls
Expand Down
7 changes: 4 additions & 3 deletions mantidimaging/eyes_tests/base_eyes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@
if TEST_NAME is None:
TEST_NAME = f"{getpass.getuser()}'s Local Test"

LOAD_SAMPLE = str(Path.home()) + "/mantidimaging-data/ISIS/IMAT/IMAT00010675/Tomo/IMAT_Flower_Tomo_000000.tif"
LOAD_SAMPLE = str(Path.home()) + "/mantidimaging-data-master/ISIS/IMAT/IMAT00010675/Tomo/IMAT_Flower_Tomo_000000.tif"
if not os.path.exists(LOAD_SAMPLE):
raise unittest.SkipTest(
"Data not present, please clone to your home directory e.g. git clone https://github.com/mantidproject/mantidim"
"aging-data.git ~/mantidimaging-data")
"aging-data.git ~/mantidimaging-data-master")

NEXUS_SAMPLE = str(Path.home()) + "/mantidimaging-data/24737.nxs"
NEXUS_SAMPLE = str(
Path.home()) + "/mantidimaging-data-master/Diamond/i13/AKingUVA_7050wSSwire_InSitu_95RH_2MMgCl2_p4ul_p4h/24737.nxs"

APPLITOOLS_IMAGE_DIR = os.getenv("APPLITOOLS_IMAGE_DIR")
if APPLITOOLS_IMAGE_DIR is None:
Expand Down