From 413ec5e46bbf8d8a9d15f8cacc6a6a360685c4a7 Mon Sep 17 00:00:00 2001 From: "Timothy A. Smith" Date: Tue, 28 May 2019 16:24:47 -0500 Subject: [PATCH 1/2] unpin pytest version in CI script --- build-and-test-py-project.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-and-test-py-project.sh b/build-and-test-py-project.sh index 0810a38..c74b4ec 100644 --- a/build-and-test-py-project.sh +++ b/build-and-test-py-project.sh @@ -57,7 +57,7 @@ $PIP install setuptools # Pinned to 3.0.4 because of https://github.com/pytest-dev/pytest/issues/2434 # Install before a newer version gets pulled in as a dependency -$PIP install pytest==3.0.4 pytest-warnings==0.2.0 +#$PIP install pytest==3.0.4 pytest-warnings==0.2.0 if test "$EXTRA_INSTALL" != ""; then for i in $EXTRA_INSTALL ; do -- GitLab From a5c7aa5c93b2cd92b85dce656dd69b79d9c3f898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Tue, 28 May 2019 23:45:20 +0200 Subject: [PATCH 2/2] Fix pytest installation in CI script --- build-and-test-py-project.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build-and-test-py-project.sh b/build-and-test-py-project.sh index c74b4ec..08035f5 100644 --- a/build-and-test-py-project.sh +++ b/build-and-test-py-project.sh @@ -55,9 +55,7 @@ export XDG_CACHE_HOME=$HOME/.cache/$CI_RUNNER_ID $PIP install --upgrade pip $PIP install setuptools -# Pinned to 3.0.4 because of https://github.com/pytest-dev/pytest/issues/2434 -# Install before a newer version gets pulled in as a dependency -#$PIP install pytest==3.0.4 pytest-warnings==0.2.0 +$PIP install pytest if test "$EXTRA_INSTALL" != ""; then for i in $EXTRA_INSTALL ; do -- GitLab