standardize optional requirements for CircleCI

etpinard · etpinard · commit 0b84f31f051b · 2016-09-27T10:51:33.000-04:00
- add coverage to optional requirements
- pip install optional requirements and no need for
  nothing else
diff --git a/circle.yml b/circle.yml
@@ -16,7 +16,7 @@ dependencies:
     - bash circle/setup.sh
 
     # install testing tools for circle's version of things
-    - pip install nose coverage
+    - pip install -r ${PLOTLY_OPTIONAL_REQUIREMENTS_FILE}
     - pip install -I .
 
     # we need to cd out of the project root to ensure the install worked
diff --git a/circle/setup.sh b/circle/setup.sh
@@ -35,10 +35,7 @@ for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
     pip install -r ${PLOTLY_CORE_REQUIREMENTS_FILE} ||
         error_exit "${SIG} ${LINENO}: can't install core reqs for Python ${version}."
 
+    # install optional (including test) requirements
     pip install -r ${PLOTLY_OPTIONAL_REQUIREMENTS_FILE} ||
         error_exit "${SIG} ${LINENO}: can't install optional for Python ${version}."
-
-    # install some test tools
-    pip install nose coverage ||
-        error_exit "${SIG} ${LINENO}: can't install test tools for Python ${version}."
 done
diff --git a/circle/test.sh b/circle/test.sh
@@ -31,7 +31,6 @@ for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
     echo "${SIG} Running: python -c 'import sys; print(sys.version)'. We've got:"
     python -c 'import sys; print(sys.version)'
 
-
     echo "${SIG} Install plotly (ignoring possibly cached versions)."
     pip install -I ${PLOTLY_PACKAGE_ROOT} >/dev/null ||
         error_exit "${SIG} ${LINENO}: can't install plotly package from project root"
diff --git a/optional-requirements.txt b/optional-requirements.txt
@@ -12,10 +12,11 @@ numpy
 # matplotlib==1.3.1
 
 ## testing dependencies ##
-nose==1.3.3
+nose
+coverage
 
-## ipython dependencies ##
-ipython[all]==3.0.0
+## ipython ##
+ipython
 
 ## pandas deps for some matplotlib functionality ##
 pandas
