Merge pull request #1144 from mantidproject/git-main-fixes

update mantidimaging-data urls
mantidproject · Sep 17, 2021 · c5f83d1 · c5f83d1
2 parents 092feb2 + 8d9e761
commit c5f83d1
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 218 deletions.
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -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

diff --git a/buildscripts/Jenkinsfile b/buildscripts/Jenkinsfile
diff --git a/buildscripts/create_conda_environment.sh b/buildscripts/create_conda_environment.sh
diff --git a/buildscripts/install_anaconda.sh b/buildscripts/install_anaconda.sh
diff --git a/docs/user_guide/index.rst b/docs/user_guide/index.rst
@@ -19,7 +19,7 @@ Author: Arianna Wintle (STFC)
 
 Please email any suggestions to [email protected]
 
-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
 ####################

diff --git a/install.sh b/install.sh
diff --git a/mantidimaging/eyes_tests/base_eyes.py b/mantidimaging/eyes_tests/base_eyes.py
@@ -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:

diff --git a/mantidimaging/gui/test/gui_system_base.py b/mantidimaging/gui/test/gui_system_base.py
@@ -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