Merge ff6fbaa into effc2de

fitbenchmarking · Oct 19, 2019 · 4921e37 · 4921e37
2 parents effc2de + ff6fbaa
commit 4921e37
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,8 +23,9 @@ before_install:
 install:
   - pip install -r requirements.txt
   - python setup.py install
-  - python setup.py externals
-  - python -m easy_install --upgrade pyOpenSSL
+  - python setup.py externals -s mantid
+#  - python -m easy_install --upgrade pyOpenSSL
+
 
 jobs:
   include:
@@ -35,24 +36,24 @@ jobs:
         - travis_wait pytest example_scripts/ --cov=example_scripts/
           --cov-report term-missing
         # ======= Fitting Tests =============== #
-        - pytest fitbenchmarking/fitting/ --cov=fitbenchmarking/fitting/
-          --cov-report term-missing
+        #- pytest fitbenchmarking/fitting/ --cov=fitbenchmarking/fitting/
+        #  --cov-report term-missing
         # ======= Parsing Tests =============== #
-        - pytest fitbenchmarking/parsing/tests/ --cov=fitbenchmarking/parsing/
-          --cov-report term-missing --cov-append
+        #- pytest fitbenchmarking/parsing/tests/ --cov=fitbenchmarking/parsing/
+        #  --cov-report term-missing --cov-append
         # ======= Result Processing Tests =============== #
-        - pytest fitbenchmarking/resproc/tests/
-          --cov=fitbenchmarking/resproc --cov-report term-missing
-          --cov-append
+        #- pytest fitbenchmarking/resproc/tests/
+        #  --cov=fitbenchmarking/resproc --cov-report term-missing
+        #  --cov-append
         # ======= Utils Tests =============== #
         - pytest fitbenchmarking/utils/tests/ --cov=fitbenchmarking/utils/
           --cov-report term-missing --cov-append
       after_success:
         - coveralls
     - stage: SysTests
-      before_script: mantidpython -m mantid.simpleapi || true
+      #before_script: mantidpython -m mantid.simpleapi || true
       script:
         # ======= System Test =============== #
         - cd systests
-        - mantidpython generate_current_results.py
-        - mantidpython tbl_comparison.py
+        #- mantidpython generate_current_results.py
+        #- mantidpython tbl_comparison.py