From 59a6cf9a426da20ff5cdc235d8501ed82e5da10f Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 18 Jul 2023 15:00:24 -0400 Subject: [PATCH] chore: make upgrade (to solve pyyaml/cython conflict) This happened on our pypy builds: https://github.com/yaml/pyyaml/issues/724 --- requirements/base.txt | 12 ++++----- requirements/dev.txt | 51 +++++++++++++++++++------------------- requirements/doc.txt | 24 +++++++++--------- requirements/pip-tools.txt | 9 ++++--- requirements/quality.txt | 36 +++++++++++++-------------- requirements/test.txt | 22 ++++++++-------- requirements/tox.txt | 20 +++++++-------- 7 files changed, 88 insertions(+), 86 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index ef9bc8e..99fbff8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ attrs==23.1.0 # via -r requirements/base.in certifi==2023.5.7 # via requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests -click==8.1.3 +click==8.1.5 # via # -r requirements/base.in # click-log @@ -18,19 +18,19 @@ click-log==0.4.0 # via -r requirements/base.in idna==3.4 # via requests -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via # attrs # click jinja2==3.1.2 # via -r requirements/base.in -markupsafe==2.1.2 +markupsafe==2.1.3 # via jinja2 requests==2.31.0 # via -r requirements/base.in -typing-extensions==4.6.2 +typing-extensions==4.7.1 # via importlib-metadata -urllib3==2.0.2 +urllib3==2.0.3 # via requests zipp==3.15.0 # via importlib-metadata diff --git a/requirements/dev.txt b/requirements/dev.txt index e185ec5..418e069 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,7 +8,7 @@ alabaster==0.7.13 # via # -r requirements/quality.txt # sphinx -astroid==2.15.5 +astroid==2.15.6 # via # -r requirements/quality.txt # pylint @@ -42,13 +42,13 @@ chardet==5.1.0 # via # -r requirements/tox.txt # tox -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/quality.txt # requests check-manifest==0.49 # via -r requirements/quality.txt -click==8.1.3 +click==8.1.5 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt @@ -69,7 +69,7 @@ dill==0.3.6 # via # -r requirements/quality.txt # pylint -distlib==0.3.6 +distlib==0.3.7 # via # -r requirements/tox.txt # virtualenv @@ -83,11 +83,11 @@ docutils==0.18.1 # restructuredtext-lint # sphinx # sphinx-rtd-theme -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via # -r requirements/quality.txt # pytest -filelock==3.12.0 +filelock==3.12.2 # via # -r requirements/tox.txt # tox @@ -102,7 +102,7 @@ imagesize==1.4.1 # via # -r requirements/quality.txt # sphinx -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via # -r requirements/pip-tools.txt # -r requirements/tox.txt @@ -141,7 +141,7 @@ jinja2==3.1.2 # via # -r requirements/quality.txt # sphinx -keyring==23.13.1 +keyring==24.1.1 # via # -r requirements/quality.txt # twine @@ -153,7 +153,7 @@ markdown-it-py==2.2.0 # via # -r requirements/quality.txt # rich -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/quality.txt # jinja2 @@ -169,7 +169,7 @@ more-itertools==9.1.0 # via # -r requirements/quality.txt # jaraco-classes -mypy==1.3.0 +mypy==1.4.1 # via -r requirements/quality.txt mypy-extensions==1.0.0 # via @@ -199,13 +199,13 @@ pbr==5.11.1 # via # -r requirements/quality.txt # stevedore -pip-tools==6.13.0 +pip-tools==6.14.0 # via -r requirements/pip-tools.txt pkginfo==1.9.6 # via # -r requirements/quality.txt # twine -platformdirs==3.5.1 +platformdirs==3.9.1 # via # -r requirements/quality.txt # -r requirements/tox.txt @@ -213,7 +213,7 @@ platformdirs==3.5.1 # pylint # tox # virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via # -r requirements/quality.txt # -r requirements/tox.txt @@ -239,7 +239,7 @@ pylint==2.17.4 # pylint-pytest pylint-pytest==1.0.3 # via -r requirements/quality.txt -pyproject-api==1.5.1 +pyproject-api==1.5.3 # via # -r requirements/tox.txt # tox @@ -248,12 +248,12 @@ pyproject-hooks==1.0.0 # -r requirements/pip-tools.txt # -r requirements/quality.txt # build -pytest==7.3.1 +pytest==7.4.0 # via # -r requirements/quality.txt # pylint-pytest # pytest-mock -pytest-mock==3.10.0 +pytest-mock==3.11.1 # via -r requirements/quality.txt python-dateutil==2.8.2 # via @@ -263,7 +263,7 @@ pytz==2023.3 # via # -r requirements/quality.txt # babel -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/quality.txt # responses @@ -292,7 +292,7 @@ rfc3986==2.0.0 # via # -r requirements/quality.txt # twine -rich==13.3.5 +rich==13.4.2 # via # -r requirements/quality.txt # twine @@ -311,7 +311,7 @@ sphinx==5.3.0 # -r requirements/quality.txt # sphinx-rtd-theme # sphinxcontrib-jquery -sphinx-rtd-theme==1.2.1 +sphinx-rtd-theme==1.2.2 # via -r requirements/quality.txt sphinxcontrib-applehelp==1.0.2 # via @@ -353,6 +353,7 @@ tomli==2.0.1 # build # check-manifest # mypy + # pip-tools # pylint # pyproject-api # pyproject-hooks @@ -362,15 +363,15 @@ tomlkit==0.11.8 # via # -r requirements/quality.txt # pylint -tox==4.5.2 +tox==4.6.4 # via # -r requirements/tox.txt # tox-gh -tox-gh==1.0.0 +tox-gh==1.2.0 # via -r requirements/tox.txt twine==4.0.2 # via -r requirements/quality.txt -typed-ast==1.5.4 +typed-ast==1.5.5 # via # -r requirements/quality.txt # astroid @@ -390,7 +391,7 @@ types-urllib3==1.26.25.13 # via # -r requirements/quality.txt # types-requests -typing-extensions==4.6.2 +typing-extensions==4.7.1 # via # -r requirements/pip-tools.txt # -r requirements/tox.txt @@ -404,7 +405,7 @@ typing-extensions==4.6.2 # responses # rich # tox -urllib3==2.0.2 +urllib3==2.0.3 # via # -r requirements/quality.txt # requests @@ -419,7 +420,7 @@ urwid-readline==0.13 # via # -r requirements/quality.txt # pudb -virtualenv==20.23.0 +virtualenv==20.24.0 # via # -r requirements/tox.txt # tox diff --git a/requirements/doc.txt b/requirements/doc.txt index e02d11c..8068525 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -14,11 +14,11 @@ certifi==2023.5.7 # via # -r requirements/test.txt # requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/test.txt # requests -click==8.1.3 +click==8.1.5 # via # -r requirements/test.txt # click-log @@ -36,7 +36,7 @@ docutils==0.18.1 # restructuredtext-lint # sphinx # sphinx-rtd-theme -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via # -r requirements/test.txt # pytest @@ -48,7 +48,7 @@ idna==3.4 # requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via # -r requirements/test.txt # attrs @@ -69,7 +69,7 @@ jinja2==3.1.2 # via # -r requirements/test.txt # sphinx -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/test.txt # jinja2 @@ -85,7 +85,7 @@ parso==0.8.3 # jedi pbr==5.11.1 # via stevedore -pluggy==1.0.0 +pluggy==1.2.0 # via # -r requirements/test.txt # pytest @@ -97,11 +97,11 @@ pygments==2.15.1 # doc8 # pudb # sphinx -pytest==7.3.1 +pytest==7.4.0 # via # -r requirements/test.txt # pytest-mock -pytest-mock==3.10.0 +pytest-mock==3.11.1 # via -r requirements/test.txt python-dateutil==2.8.2 # via @@ -109,7 +109,7 @@ python-dateutil==2.8.2 # freezegun pytz==2023.3 # via babel -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/test.txt # responses @@ -133,7 +133,7 @@ sphinx==5.3.0 # -r requirements/doc.in # sphinx-rtd-theme # sphinxcontrib-jquery -sphinx-rtd-theme==1.2.1 +sphinx-rtd-theme==1.2.2 # via -r requirements/doc.in sphinxcontrib-applehelp==1.0.2 # via sphinx @@ -159,12 +159,12 @@ types-pyyaml==6.0.12.10 # via # -r requirements/test.txt # responses -typing-extensions==4.6.2 +typing-extensions==4.7.1 # via # -r requirements/test.txt # importlib-metadata # responses -urllib3==2.0.2 +urllib3==2.0.3 # via # -r requirements/test.txt # requests diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 17bf35b..cba22eb 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,23 +6,24 @@ # build==0.10.0 # via pip-tools -click==8.1.3 +click==8.1.5 # via pip-tools -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via # build # click packaging==23.1 # via build -pip-tools==6.13.0 +pip-tools==6.14.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build tomli==2.0.1 # via # build + # pip-tools # pyproject-hooks -typing-extensions==4.6.2 +typing-extensions==4.7.1 # via importlib-metadata wheel==0.40.0 # via pip-tools diff --git a/requirements/quality.txt b/requirements/quality.txt index e8ab28f..01830c9 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,7 +8,7 @@ alabaster==0.7.13 # via # -r requirements/doc.txt # sphinx -astroid==2.15.5 +astroid==2.15.6 # via pylint attrs==23.1.0 # via @@ -29,14 +29,14 @@ certifi==2023.5.7 # -r requirements/doc.txt # -r requirements/test.txt # requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/doc.txt # -r requirements/test.txt # requests check-manifest==0.49 # via -r requirements/quality.in -click==8.1.3 +click==8.1.5 # via # -r requirements/doc.txt # -r requirements/test.txt @@ -64,7 +64,7 @@ docutils==0.18.1 # restructuredtext-lint # sphinx # sphinx-rtd-theme -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via # -r requirements/doc.txt # -r requirements/test.txt @@ -82,7 +82,7 @@ imagesize==1.4.1 # via # -r requirements/doc.txt # sphinx -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via # -r requirements/doc.txt # -r requirements/test.txt @@ -118,13 +118,13 @@ jinja2==3.1.2 # -r requirements/doc.txt # -r requirements/test.txt # sphinx -keyring==23.13.1 +keyring==24.1.1 # via twine lazy-object-proxy==1.9.0 # via astroid markdown-it-py==2.2.0 # via rich -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/doc.txt # -r requirements/test.txt @@ -135,7 +135,7 @@ mdurl==0.1.2 # via markdown-it-py more-itertools==9.1.0 # via jaraco-classes -mypy==1.3.0 +mypy==1.4.1 # via -r requirements/quality.in mypy-extensions==1.0.0 # via @@ -163,11 +163,11 @@ pbr==5.11.1 # stevedore pkginfo==1.9.6 # via twine -platformdirs==3.5.1 +platformdirs==3.9.1 # via # black # pylint -pluggy==1.0.0 +pluggy==1.2.0 # via # -r requirements/doc.txt # -r requirements/test.txt @@ -197,13 +197,13 @@ pylint-pytest==1.0.3 # via -r requirements/quality.in pyproject-hooks==1.0.0 # via build -pytest==7.3.1 +pytest==7.4.0 # via # -r requirements/doc.txt # -r requirements/test.txt # pylint-pytest # pytest-mock -pytest-mock==3.10.0 +pytest-mock==3.11.1 # via # -r requirements/doc.txt # -r requirements/test.txt @@ -216,7 +216,7 @@ pytz==2023.3 # via # -r requirements/doc.txt # babel -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/doc.txt # -r requirements/test.txt @@ -243,7 +243,7 @@ restructuredtext-lint==1.4.0 # doc8 rfc3986==2.0.0 # via twine -rich==13.3.5 +rich==13.4.2 # via twine six==1.16.0 # via @@ -261,7 +261,7 @@ sphinx==5.3.0 # -r requirements/doc.txt # sphinx-rtd-theme # sphinxcontrib-jquery -sphinx-rtd-theme==1.2.1 +sphinx-rtd-theme==1.2.2 # via -r requirements/doc.txt sphinxcontrib-applehelp==1.0.2 # via @@ -310,7 +310,7 @@ tomlkit==0.11.8 # via pylint twine==4.0.2 # via -r requirements/quality.in -typed-ast==1.5.4 +typed-ast==1.5.5 # via # astroid # black @@ -328,7 +328,7 @@ types-toml==0.10.8.6 # via -r requirements/quality.in types-urllib3==1.26.25.13 # via types-requests -typing-extensions==4.6.2 +typing-extensions==4.7.1 # via # -r requirements/doc.txt # -r requirements/test.txt @@ -341,7 +341,7 @@ typing-extensions==4.6.2 # pylint # responses # rich -urllib3==2.0.2 +urllib3==2.0.3 # via # -r requirements/doc.txt # -r requirements/test.txt diff --git a/requirements/test.txt b/requirements/test.txt index fbd3bc2..d49440e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -10,11 +10,11 @@ certifi==2023.5.7 # via # -r requirements/base.txt # requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests -click==8.1.3 +click==8.1.5 # via # -r requirements/base.txt # click-log @@ -22,7 +22,7 @@ click-log==0.4.0 # via -r requirements/base.txt coverage==7.2.7 # via -r requirements/test.in -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via pytest freezegun==1.2.2 # via -r requirements/test.in @@ -30,7 +30,7 @@ idna==3.4 # via # -r requirements/base.txt # requests -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via # -r requirements/base.txt # attrs @@ -43,7 +43,7 @@ jedi==0.18.2 # via pudb jinja2==3.1.2 # via -r requirements/base.txt -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/base.txt # jinja2 @@ -53,19 +53,19 @@ packaging==23.1 # pytest parso==0.8.3 # via jedi -pluggy==1.0.0 +pluggy==1.2.0 # via pytest pudb==2022.1.3 # via -r requirements/test.in pygments==2.15.1 # via pudb -pytest==7.3.1 +pytest==7.4.0 # via pytest-mock -pytest-mock==3.10.0 +pytest-mock==3.11.1 # via -r requirements/test.in python-dateutil==2.8.2 # via freezegun -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/test.in # responses @@ -81,12 +81,12 @@ tomli==2.0.1 # via pytest types-pyyaml==6.0.12.10 # via responses -typing-extensions==4.6.2 +typing-extensions==4.7.1 # via # -r requirements/base.txt # importlib-metadata # responses -urllib3==2.0.2 +urllib3==2.0.3 # via # -r requirements/base.txt # requests diff --git a/requirements/tox.txt b/requirements/tox.txt index 3700f48..9305b73 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -10,13 +10,13 @@ chardet==5.1.0 # via tox colorama==0.4.6 # via tox -distlib==0.3.6 +distlib==0.3.7 # via virtualenv -filelock==3.12.0 +filelock==3.12.2 # via # tox # virtualenv -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via # pluggy # tox @@ -25,30 +25,30 @@ packaging==23.1 # via # pyproject-api # tox -platformdirs==3.5.1 +platformdirs==3.9.1 # via # tox # virtualenv -pluggy==1.0.0 +pluggy==1.2.0 # via tox -pyproject-api==1.5.1 +pyproject-api==1.5.3 # via tox tomli==2.0.1 # via # pyproject-api # tox -tox==4.5.2 +tox==4.6.4 # via # -r requirements/tox.in # tox-gh -tox-gh==1.0.0 +tox-gh==1.2.0 # via -r requirements/tox.in -typing-extensions==4.6.2 +typing-extensions==4.7.1 # via # importlib-metadata # platformdirs # tox -virtualenv==20.23.0 +virtualenv==20.24.0 # via tox zipp==3.15.0 # via importlib-metadata