Merge pull request #698 from gliptak/travis2

bashtage · web-flow · commit 17f5818f6df5 · 2019-09-19T23:05:56.000+01:00
Make requirements more specific
diff --git a/ci/pypi-install.sh b/ci/pypi-install.sh
@@ -1,11 +1,8 @@
 #!/usr/bin/env bash
 
 pip install pip --upgrade
-pip install numpy=="$NUMPY" pytz python-dateutil coverage setuptools html5lib lxml pytest pytest-cov wrapt codecov coveralls beautifulsoup4 isort flake8
-
-if (( $(echo "$TRAVIS_PYTHON_VERSION > 3.5" | bc -l) ));  then
-  pip install black flake8-bugbear
-fi
+pip install numpy=="$NUMPY" lxml
+pip install -r requirements-dev.txt
 
 if [[ "$PANDAS" == "MASTER" ]]; then
   PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
@@ -15,5 +12,6 @@ else
 fi
 
 if [[ "$DOCBUILD" ]]; then
-  pip install sphinx ipython matplotlib sphinx_rtd_theme doctr requests_cache
+  pip install doctr
+  pip install -r docs/requirements.txt
 fi
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,7 +1,5 @@
-lxml
-pandas>=0.21
-requests>=2.3.0
-wrapt
+sphinx
 ipython
+matplotlib
+sphinx_rtd_theme
 requests_cache
-sphinx
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,6 +1,9 @@
-ipython
-requests_cache
-sphinx
-sphinx_rtd_theme
-black
-isort
+black; python_version > '3.5'
+flake8-bugbear; python_version > '3.5'
+coverage
+codecov
+coveralls
+flake8
+pytest
+pytest-cov
+wrapt
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,3 @@
 lxml
 pandas>=0.21
-pytest>=4.0.2
 requests>=2.3.0
-wrapt
