Merge branch 'rf/fsl-ci-rules-change' into 'master'

RF: fsl-ci-rules has changed location

See merge request fsl/conda/manifest-rules!27

.gitlab-ci.yml

@@ -18,7 +18,7 @@ test:
     - fsl-ci
     - docker
   script:
-    - pip install git+https://git.fmrib.ox.ac.uk/fsl/fsl-ci-rules.git
+    - pip install git+https://git.fmrib.ox.ac.uk/fsl/conda/fsl-ci-rules.git
     - pip install .
     - which deploy_files
     - which generate_environment_files
@@ -40,7 +40,7 @@ check-manifest-gitab-ci-yml:
     - fsl-ci
     - docker
   script:
-    - pip install git+https://git.fmrib.ox.ac.uk/fsl/fsl-ci-rules.git
+    - pip install git+https://git.fmrib.ox.ac.uk/fsl/conda/fsl-ci-rules.git
     - python ./.ci/check_manifest_gitlab_ci_yml.py
 
 

manifest-gitlab-ci.yml

@@ -20,7 +20,7 @@ default:
       conda create -c conda-forge -p ./env python=3.9;
       if [ -f "$CONDABINDIR"/activate ]; then source $CONDABINDIR/activate ./env;
       else                                    conda               activate ./env; fi;
-      python -m pip install git+https://git.fmrib.ox.ac.uk/fsl/fsl-ci-rules.git;
+      python -m pip install git+https://git.fmrib.ox.ac.uk/fsl/conda/fsl-ci-rules.git;
       python -m pip install git+https://git.fmrib.ox.ac.uk/fsl/conda/manifest-rules.git;
 
 

manifest_rules/__init__.py

 #!/usr/bin/env python
 
 
-__version__ = '0.4.10'
+__version__ = '0.4.11'

setup.py

@@ -10,7 +10,7 @@ basedir = op.dirname(__file__)
 
 
 # fsl-ci-rules can be installed beforehand from
-# https://git.fmrib.ox.ac.uk/fsl/fsl-ci-rules
+# https://git.fmrib.ox.ac.uk/fsl/conda/fsl-ci-rules
 requirements = ['fsl-ci-rules', 'pyyaml', 'python-dateutil']
 
 version = {}