diff options
author | Matti Picus <matti.picus@gmail.com> | 2020-12-14 17:18:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-14 17:18:53 +0200 |
commit | de3fcf1473c7a13da1f8f643f6bf33c0c306f73d (patch) | |
tree | 068d156c5d654286e8835478bdc9be856537075f | |
parent | 12d99b5a144db8d789d7bd00b8771396d90df5a4 (diff) | |
parent | 25ddde79eb14240b158c80abcece6f33663bbeb8 (diff) | |
download | numpy-de3fcf1473c7a13da1f8f643f6bf33c0c306f73d.tar.gz |
Merge pull request #17995 from numpy/dependabot/pip/pytest-6.2.0
MAINT: Bump pytest from 6.0.2 to 6.2.0
-rw-r--r-- | pytest.ini | 3 | ||||
-rw-r--r-- | test_requirements.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pytest.ini b/pytest.ini index 149af04b8..dfad538c2 100644 --- a/pytest.ini +++ b/pytest.ini @@ -14,4 +14,5 @@ filterwarnings = # Matrix PendingDeprecationWarning. ignore:the matrix subclass is not ignore:Importing from numpy.matlib is - +# pytest warning when using PYTHONOPTIMIZE + ignore:assertions not in test modules or plugins:pytest.PytestConfigWarning diff --git a/test_requirements.txt b/test_requirements.txt index f640c6ec8..1f7b229b4 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -2,7 +2,7 @@ cython==0.29.21 wheel<0.36.3 setuptools<49.2.0 hypothesis==5.41.5 -pytest==6.0.2 +pytest==6.2.0 pytz==2020.4 pytest-cov==2.10.1 pickle5; python_version == '3.7' and platform_python_implementation != 'PyPy' |