Merge remote-tracking branch 'origin/master' into add_vamp

deeptime-ml · Sep 11, 2019 · ac30156 · ac30156
2 parents 3c89d29 + 95e7b17
commit ac30156
Show file tree

Hide file tree

Showing 9 changed files with 792 additions and 12 deletions.
diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml
@@ -30,25 +30,21 @@ requirements:
     - pybind11
 
   run:
-    - bhmm >=0.6.3,<0.7
+    #- bhmm >=0.6.3,<0.7
     - intel-openmp # [osx]
-    - msmtools >=1.2
+    - msmtools
     - {{ pin_compatible('numpy') }}
     - python
     - scipy
     - setuptools
-    - tqdm
     - pint
-    - pip
 
 test:
   source_files:
     - tests/*
   requires:
     - scikit-learn
-    - pyemma # TODO: remove in the future
     - pytest
     - pytest-cov
     - pytest-faulthandler
-    - pytest-xdist
     - pytest-sugar
diff --git a/devtools/conda-recipe/run_test.py b/devtools/conda-recipe/run_test.py
@@ -14,7 +14,6 @@
 print('junit destination:', junit_xml)
 
 pytest_args = ("-vv "
-               "-n2 "  # n jobs
                "--cov={cover_pkg} "
                "--cov-report=xml:{dest_report} "
                "--doctest-modules "