Merge pull request #516 from EducationalTestingService/feature/515_us…

…e_conda_reqs_for_travis Feature/515 use conda reqs for travis
EducationalTestingService · Sep 20, 2019 · 1b58f3d · 1b58f3d
2 parents d913c7b + c5cdd27
commit 1b58f3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ before_install:
   - export PATH=/home/travis/miniconda3/bin:$PATH
   - conda update --yes conda
 install:
-  - conda install --yes --channel defaults --channel conda-forge python=$TRAVIS_PYTHON_VERSION numpy scipy seaborn pandas beautifulsoup4 scikit-learn==0.20.1 joblib tabulate codecov ruamel.yaml
+  - conda install --yes --channel conda-forge python=$TRAVIS_PYTHON_VERSION codecov --file conda_requirements.txt
   # Have to use pip for nose-cov because its entry points are not supported by conda yet
   - pip install nose-cov
   - python setup.py install

diff --git a/conda_requirements.txt b/conda_requirements.txt
@@ -1,7 +1,7 @@
 scikit-learn==0.20.1
-PrettyTable
 beautifulsoup4
 tabulate
+intel-openmp==2019.4
 numpy
 scipy
 pandas