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

update mantidimaging-data urls #1144

Merged
merged 4 commits into from
Sep 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ jobs:
- name: Get test data
shell: bash -l {0}
run: |
wget -nv https://github.com/mantidproject/mantidimaging-data/archive/refs/heads/master.zip
unzip -q master.zip -d ~
wget -nv https://github.com/mantidproject/mantidimaging-data/archive/refs/heads/main.zip
unzip -q main.zip -d ~
mv ~/mantidimaging-data-main ~/mantidimaging-data
timeout-minutes: 5

- name: GUI Tests System
Expand Down
115 changes: 0 additions & 115 deletions buildscripts/Jenkinsfile

This file was deleted.

22 changes: 0 additions & 22 deletions buildscripts/create_conda_environment.sh

This file was deleted.

37 changes: 0 additions & 37 deletions buildscripts/install_anaconda.sh

This file was deleted.

2 changes: 1 addition & 1 deletion docs/user_guide/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Author: Arianna Wintle (STFC)

Please email any suggestions to mantidimagingsupport@stfc365.onmicrosoft.com

Example data that can be used for this tutorial can be downloaded from `github.com/mantidproject/mantidimaging-data <https://github.com/mantidproject/mantidimaging-data/archive/refs/heads/master.zip>`_
Example data that can be used for this tutorial can be downloaded from `github.com/mantidproject/mantidimaging-data <https://github.com/mantidproject/mantidimaging-data/archive/refs/heads/main.zip>`_

Loading Sample Stack
####################
Expand Down
36 changes: 0 additions & 36 deletions install.sh

This file was deleted.

6 changes: 3 additions & 3 deletions mantidimaging/eyes_tests/base_eyes.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
if TEST_NAME is None:
TEST_NAME = f"{getpass.getuser()}'s Local Test"

LOAD_SAMPLE = str(Path.home()) + "/mantidimaging-data-master/ISIS/IMAT/IMAT00010675/Tomo/IMAT_Flower_Tomo_000000.tif"
LOAD_SAMPLE = str(Path.home()) + "/mantidimaging-data/ISIS/IMAT/IMAT00010675/Tomo/IMAT_Flower_Tomo_000000.tif"
LOAD_SAMPLE_MISSING_MESSAGE = """Data not present, please clone to your home directory e.g.
git clone https://github.com/mantidproject/mantidimaging-data.git ~/mantidimaging-data-master"""
git clone https://github.com/mantidproject/mantidimaging-data.git"""

NEXUS_SAMPLE = str(
Path.home()) + "/mantidimaging-data-master/Diamond/i13/AKingUVA_7050wSSwire_InSitu_95RH_2MMgCl2_p4ul_p4h/24737.nxs"
Path.home()) + "/mantidimaging-data/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
4 changes: 2 additions & 2 deletions mantidimaging/gui/test/gui_system_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

versions._use_test_values()

LOAD_SAMPLE = str(Path.home()) + "/mantidimaging-data-master/ISIS/IMAT/IMAT00010675/Tomo/IMAT_Flower_Tomo_000000.tif"
LOAD_SAMPLE = str(Path.home()) + "/mantidimaging-data/ISIS/IMAT/IMAT00010675/Tomo/IMAT_Flower_Tomo_000000.tif"
LOAD_SAMPLE_MISSING_MESSAGE = """Data not present, please clone to your home directory e.g.
git clone https://github.com/mantidproject/mantidimaging-data.git ~/mantidimaging-data-master"""
git clone https://github.com/mantidproject/mantidimaging-data.git"""

SHOW_DELAY = 10 # Can be increased to watch tests
SHORT_DELAY = 100
Expand Down