update CI.

.gitlab-ci.yml

@@ -15,37 +15,31 @@ before_script:
   - apt-get -y install -f openjdk-11-jre-headless texlive-latex-extra dvipng
   - conda env create -f environment.yml
   - source activate resultsanalysis
+  - conda install -c conda-forge phasexmlparser
   - ls
   - cd ../
-  - if [[ ! -d 'xmlvalidator' ]]; then git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/utils/xmlvalidator.git; fi
-  - cd xmlvalidator
-  - pip install .
-  - cd ../
   - if [[ ! -d 'resultsanalysis' ]]; then git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/utils/resultsanalysis.git; fi
   - cd resultsanalysis
   - pip install .
   - cd ../
-  - if [[ -d 'phasexmlparser' ]]; then rm -r phasexmlparser; fi
-  - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/utils/phasexmlparser.git
-  - cd phasexmlparser
-  - pip install .
-  - cd ../
   - if [[ -d 'phasexmlcreator' ]]; then rm -r phasexmlcreator; fi
-  - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/ssimpleapps/phasexmlcreator.git
+  - git clone git@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/ssimpleapps/phasexmlcreator.git
   - cd phasexmlcreator
   - pip install .
   - cd ../
-  - if [[ ! -d 'puresolventinformation' ]]; then git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/ssimpleapps/puresolventinformation.git; fi
+  - if [[ -d 'puresolventinformation' ]]; then rm -r puresolventinformation; fi
+  - git clone git@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/ssimpleapps/puresolventinformation.git
   - cd puresolventinformation
   - pip install .
   - cd ../
   - if [[ -d 'solventmapcreator' ]]; then rm -r solventmapcreator; fi
-  - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.developers.cam.ac.uk/ch/hunter/ssiptools/ssimpleapps/solventmapcreator.git
+  - git clone git@gitlab.developers.cam.ac.uk:ch/hunter/ssiptools/ssimpleapps/solventmapcreator.git
   - cd solventmapcreator
-  - pip install .
+  - pip install . --no-deps
   - cd ../phasecalculator
+  - pip install . --no-deps
 
 
 unittest:
   script:
-    - pytest phasecalculator/test/*test/*test.py
+    - pytest --pyargs phasecalculator