Merge pull request #453 from pllim/pin-pytest-lt-6

Pin pytest<6
astropy · Jul 29, 2020 · e135ca1 · e135ca1
2 parents bc25531 + c117408
commit e135ca1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pip_pinnings.txt b/pip_pinnings.txt
@@ -1 +1 @@
-
+pytest<6
diff --git a/travis/setup_dependencies_common.sh b/travis/setup_dependencies_common.sh
@@ -263,6 +263,12 @@ fi
 
 # CORE DEPENDENCIES
 
+# Temporary version limitation, remove once
+# https://github.com/astropy/pytest-doctestplus/issues/118 is fixed and released
+if [[ -z $PYTEST_VERSION ]]; then
+    PYTEST_VERSION="<6"
+fi
+
 if [[ ! -z $PYTEST_VERSION && $PYTEST_VERSION != dev* ]]; then
     echo "pytest ${PYTEST_VERSION}.*" >> $PIN_FILE
 fi