From f2865dbcf61a6b91528919153efd08f486e96876 Mon Sep 17 00:00:00 2001 From: CI on behalf of the Hypothesis team Date: Sun, 26 Jun 2022 00:07:13 +0000 Subject: [PATCH 1/2] Update pinned dependencies --- requirements/coverage.txt | 8 ++++---- requirements/test.txt | 2 +- requirements/tools.txt | 28 ++++++++++++++-------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/requirements/coverage.txt b/requirements/coverage.txt index ac6f5164d3..52e7b08ffe 100644 --- a/requirements/coverage.txt +++ b/requirements/coverage.txt @@ -24,7 +24,7 @@ deprecated==1.2.13 # via redis dpcontracts==0.6.0 # via -r requirements/coverage.in -exceptiongroup==1.0.0rc8 ; python_version < "3.11.0b1" +exceptiongroup==1.0.0rc8 ; python_version < "3.11" # via hypothesis (hypothesis-python/setup.py) execnet==1.9.0 # via pytest-xdist @@ -34,13 +34,13 @@ iniconfig==1.1.1 # via pytest lark-parser==0.12.0 # via -r requirements/coverage.in -libcst==0.4.3 +libcst==0.4.5 # via -r requirements/coverage.in mypy-extensions==0.4.3 # via # black # typing-inspect -numpy==1.22.4 +numpy==1.23.0 # via # -r requirements/coverage.in # pandas @@ -48,7 +48,7 @@ packaging==21.3 # via # pytest # redis -pandas==1.4.2 +pandas==1.4.3 # via -r requirements/coverage.in pathspec==0.9.0 # via black diff --git a/requirements/test.txt b/requirements/test.txt index 373b56b831..05fd251b61 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,7 +8,7 @@ attrs==21.4.0 # via # hypothesis (hypothesis-python/setup.py) # pytest -exceptiongroup==1.0.0rc8 ; python_version < "3.11.0b1" +exceptiongroup==1.0.0rc8 ; python_version < "3.11" # via hypothesis (hypothesis-python/setup.py) execnet==1.9.0 # via pytest-xdist diff --git a/requirements/tools.txt b/requirements/tools.txt index fe5d88045b..5ed8600793 100644 --- a/requirements/tools.txt +++ b/requirements/tools.txt @@ -19,7 +19,7 @@ attrs==21.4.0 # pytest autoflake==1.4 # via shed -babel==2.10.1 +babel==2.10.3 # via sphinx backcall==0.2.0 # via ipython @@ -33,7 +33,7 @@ black==22.3.0 # via shed bleach==5.0.0 # via readme-renderer -certifi==2022.5.18.1 +certifi==2022.6.15 # via requests cffi==1.15.0 # via cryptography @@ -67,7 +67,7 @@ docutils==0.17.1 # sphinx-rtd-theme dpcontracts==0.6.0 # via -r requirements/tools.in -exceptiongroup==1.0.0rc8 ; python_version < "3.11.0b1" +exceptiongroup==1.0.0rc8 ; python_version < "3.11" # via hypothesis (hypothesis-python/setup.py) executing==0.8.3 # via stack-data @@ -95,7 +95,7 @@ flake8-2020==1.6.1 # via -r requirements/tools.in flake8-bandit==3.0.0 # via -r requirements/tools.in -flake8-bugbear==22.4.25 +flake8-bugbear==22.6.22 # via -r requirements/tools.in flake8-builtins==1.5.3 # via -r requirements/tools.in @@ -109,7 +109,7 @@ flake8-helper==0.2.1 # via flake8-strftime flake8-mutable==1.2.0 # via -r requirements/tools.in -flake8-noqa==1.2.2 +flake8-noqa==1.2.5 # via -r requirements/tools.in flake8-pie==0.15.0 # via -r requirements/tools.in @@ -135,7 +135,7 @@ idna==3.3 # via requests imagesize==1.3.0 # via sphinx -importlib-metadata==4.11.4 +importlib-metadata==4.12.0 # via # keyring # sphinx @@ -158,7 +158,7 @@ keyring==23.6.0 # via twine lark-parser==0.12.0 # via -r requirements/tools.in -libcst==0.4.3 +libcst==0.4.5 # via # -r requirements/tools.in # shed @@ -175,7 +175,7 @@ mypy-extensions==0.4.3 # black # mypy # typing-inspect -nodeenv==1.6.0 +nodeenv==1.7.0 # via pyright packaging==21.3 # via @@ -287,7 +287,7 @@ sortedcontainers==2.4.0 # via hypothesis (hypothesis-python/setup.py) soupsieve==2.3.2.post1 # via beautifulsoup4 -sphinx==5.0.1 +sphinx==5.0.2 # via # -r requirements/tools.in # sphinx-codeautolink @@ -315,7 +315,7 @@ sphinxcontrib-serializinghtml==1.1.5 # via sphinx sqlparse==0.4.2 # via django -stack-data==0.2.0 +stack-data==0.3.0 # via ipython stevedore==3.5.0 # via bandit @@ -333,7 +333,7 @@ tomli==2.0.1 # pytest tox==3.25.0 # via -r requirements/tools.in -traitlets==5.2.2.post1 +traitlets==5.3.0 # via # ipython # matplotlib-inline @@ -343,9 +343,9 @@ types-click==7.1.8 # via -r requirements/tools.in types-pkg-resources==0.1.3 # via -r requirements/tools.in -types-pytz==2021.3.8 +types-pytz==2022.1.0 # via -r requirements/tools.in -types-redis==4.2.6 +types-redis==4.3.2 # via -r requirements/tools.in typing-extensions==4.2.0 # via @@ -363,7 +363,7 @@ urllib3==1.26.9 # via # requests # twine -virtualenv==20.14.1 +virtualenv==20.15.0 # via tox wcwidth==0.2.5 # via prompt-toolkit From 17cc22dce375df10e67a73f00edeb7b366ef72ca Mon Sep 17 00:00:00 2001 From: Zac Hatfield-Dodds Date: Sat, 25 Jun 2022 19:18:29 -0700 Subject: [PATCH 2/2] Remove newaxis test workaround --- .../tests/array_api/test_indices.py | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/hypothesis-python/tests/array_api/test_indices.py b/hypothesis-python/tests/array_api/test_indices.py index 70b30c665a..d89b6b3936 100644 --- a/hypothesis-python/tests/array_api/test_indices.py +++ b/hypothesis-python/tests/array_api/test_indices.py @@ -94,25 +94,6 @@ def test_efficiently_generate_indexers(xp, xps): @given(allow_newaxis=st.booleans(), allow_ellipsis=st.booleans(), data=st.data()) def test_generate_valid_indices(xp, xps, allow_newaxis, allow_ellipsis, data): """Strategy generates valid indices.""" - try: - import numpy.array_api - except ImportError: - pass - else: - if allow_newaxis and xp is numpy.array_api: - # Special case NumPy due to https://github.com/numpy/numpy/issues/21373 - x = xp.ones(5) - try: - x[None, :] - except IndexError: - note("Forcing `allow_newaxis=False` for np.array_api") - allow_newaxis = False - else: - raise AssertionError( - "numpy.array_api looks to now support newaxis indexing, " - "so this try/except/else special case should be removed." - ) - shape = data.draw( xps.array_shapes(min_dims=1, max_side=4) | xps.array_shapes(min_dims=1, min_side=0, max_side=10),