From 924678f6556cc7b360295312c63e0bb881db79a7 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Wed, 14 Sep 2022 18:14:05 +0200 Subject: [PATCH 1/3] MAINT unpin pytest --- continuous_integration/install.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh index 13cb8df75..cb90b34ef 100755 --- a/continuous_integration/install.sh +++ b/continuous_integration/install.sh @@ -12,9 +12,7 @@ set -e create_new_conda_env() { conda update --yes conda - # TODO: unpin pytest once it no longer causes test errors because of - # PytestRemovedIn8Warning warnings - TO_INSTALL="python=$PYTHON_VERSION pip pytest<7.0 $EXTRA_CONDA_PACKAGES" + TO_INSTALL="python=$PYTHON_VERSION pip pytest $EXTRA_CONDA_PACKAGES" conda create -n testenv --yes -c conda-forge $TO_INSTALL source activate testenv } @@ -25,9 +23,7 @@ create_new_pypy3_env() { tar xvf $PYPY_FOLDER.tar.bz2 $PYPY_FOLDER/bin/pypy3 -m venv pypy3 source pypy3/bin/activate - # TODO: unpin pytest once it no longer causes test errors because of - # PytestRemovedIn8Warning warnings - pip install -U pip 'pytest<7.0' + pip install -U pip 'pytest' } if [[ "$PYTHON_VERSION" == "pypy3" ]]; then From 8cf0b4f76d35046ab1a41230e77fb9f8d401aed1 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Wed, 14 Sep 2022 18:14:49 +0200 Subject: [PATCH 2/3] MAINT unpin coverage --- continuous_integration/install.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh index cb90b34ef..41e21e77c 100755 --- a/continuous_integration/install.sh +++ b/continuous_integration/install.sh @@ -47,10 +47,7 @@ if [ -n "$NUMPY_VERSION" ]; then fi if [[ "$COVERAGE" == "true" ]]; then - # TODO: unpin when https://github.com/nedbat/coveragepy/issues/883 is fixed - # Weird issues with recent version of coverage: unpin when not causing - # pytest to raise INTERNALERROR exceptions. - PIP_INSTALL_PACKAGES="$PIP_INSTALL_PACKAGES coverage==4.5.4 pytest-cov codecov" + PIP_INSTALL_PACKAGES="$PIP_INSTALL_PACKAGES coverage pytest-cov codecov" fi if [[ "pypy3" != *"$PYTHON_VERSION"* ]]; then From 80edf6b996dbf719a7c5cf0e51f67f8d1ab78964 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Wed, 14 Sep 2022 18:15:43 +0200 Subject: [PATCH 3/3] Wait longer for slow FS in test_child_raises_parent_exits_cleanly --- joblib/test/test_memmapping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/joblib/test/test_memmapping.py b/joblib/test/test_memmapping.py index b752027d8..5488ac8a7 100644 --- a/joblib/test/test_memmapping.py +++ b/joblib/test/test_memmapping.py @@ -839,7 +839,7 @@ def get_temp_folder(parallel_obj, backend): # the temporary folder should be deleted by the end of this # call but apparently on some file systems, this takes # some time to be visible. - for i in range(10): + for i in range(100): if not os.path.exists(temp_folder): break sleep(.1)