Merge pull request #340 from pllim/unpin-pytest-3-7

Unpin pytest<3.7 in Travis and Appveyor
astropy · Nov 14, 2018 · 7caa8fc · 7caa8fc
2 parents c47d5f6 + 94a89ba
commit 7caa8fc
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/appveyor/pinned b/appveyor/pinned
@@ -1 +0,0 @@
-pytest <3.7

diff --git a/test_env.py b/test_env.py
@@ -7,9 +7,7 @@
 
 PYTEST_LT_3 = LooseVersion(pytest.__version__) < LooseVersion('3')
 
-# Remove this assert once we remove pinning pytest
 PYTEST_LT_37 = LooseVersion(pytest.__version__) < LooseVersion('3.7')
-assert PYTEST_LT_37
 
 
 # If we are on Travis or AppVeyor, we should check if we are running the tests

diff --git a/travis/setup_dependencies_common.sh b/travis/setup_dependencies_common.sh
@@ -187,10 +187,6 @@ fi
 
 if [[ ! -z $PYTEST_VERSION ]]; then
     echo "pytest ${PYTEST_VERSION}*" >> $PIN_FILE
-else
-    # pin pytest to avoid upstream issues
-    # https://github.com/astropy/pytest-doctestplus/issues/22
-    echo "pytest <3.7" >> $PIN_FILE
 fi
 
 if [[ ! -z $PIP_VERSION ]]; then