From 8155d60e9a3d4bf4f045ed8eb263a272f93f67f4 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Tue, 20 Dec 2022 15:59:41 -0800 Subject: [PATCH] remove setuptools pin (#9520) --- tools/pinning/current/pyproject.toml | 7 ------- tools/requirements.txt | 29 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/tools/pinning/current/pyproject.toml b/tools/pinning/current/pyproject.toml index 9680fb2a1..20cc75a73 100644 --- a/tools/pinning/current/pyproject.toml +++ b/tools/pinning/current/pyproject.toml @@ -66,13 +66,6 @@ cryptography = "!= 37.0.3" # https://github.com/python-poetry/poetry-plugin-export/issues/168 is resolved. poetry = "<1.3.0" -# jsonpickle is currently pinning back setuptools which can cause some problems -# in newer versions of Python. Until -# https://github.com/jsonpickle/jsonpickle/issues/424 is resolved, let's -# require a newer version of setuptools ourselves so a solution other than -# downgrading setuptools is found. -setuptools = ">=62.3.0" - [tool.poetry.dev-dependencies] [build-system] diff --git a/tools/requirements.txt b/tools/requirements.txt index fd28956fb..d83694afa 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -17,8 +17,8 @@ backports-cached-property==1.0.2 ; python_version >= "3.7" and python_version < bcrypt==4.0.1 ; python_version >= "3.7" and python_version < "4.0" beautifulsoup4==4.11.1 ; python_version >= "3.7" and python_version < "4.0" bleach==5.0.1 ; python_version >= "3.7" and python_version < "4.0" -boto3==1.26.27 ; python_version >= "3.7" and python_version < "4.0" -botocore==1.29.27 ; python_version >= "3.7" and python_version < "4.0" +boto3==1.26.32 ; python_version >= "3.7" and python_version < "4.0" +botocore==1.29.32 ; python_version >= "3.7" and python_version < "4.0" cachecontrol==0.12.11 ; python_version >= "3.7" and python_version < "4.0" cachetools==5.2.0 ; python_version >= "3.7" and python_version < "4.0" cachy==0.3.0 ; python_version >= "3.7" and python_version < "4.0" @@ -31,7 +31,7 @@ colorama==0.4.6 ; python_version < "4.0" and sys_platform == "win32" and python_ commonmark==0.9.1 ; python_version >= "3.7" and python_version < "4.0" configargparse==1.5.3 ; python_version >= "3.7" and python_version < "4.0" configobj==5.0.6 ; python_version >= "3.7" and python_version < "4.0" -coverage==6.5.0 ; python_version >= "3.7" and python_version < "4.0" +coverage==7.0.0 ; python_version >= "3.7" and python_version < "4.0" crashtest==0.3.1 ; python_version >= "3.7" and python_version < "4.0" cryptography==38.0.4 ; python_version >= "3.7" and python_version < "4.0" cython==0.29.32 ; python_version >= "3.7" and python_version < "4.0" @@ -48,7 +48,7 @@ execnet==1.9.0 ; python_version >= "3.7" and python_version < "4.0" fabric==2.7.1 ; python_version >= "3.7" and python_version < "4.0" filelock==3.8.2 ; python_version >= "3.7" and python_version < "4.0" google-api-core==2.11.0 ; python_version >= "3.7" and python_version < "4.0" -google-api-python-client==2.69.0 ; python_version >= "3.7" and python_version < "4.0" +google-api-python-client==2.70.0 ; python_version >= "3.7" and python_version < "4.0" google-auth-httplib2==0.1.0 ; python_version >= "3.7" and python_version < "4.0" google-auth==2.15.0 ; python_version >= "3.7" and python_version < "4.0" googleapis-common-protos==1.57.0 ; python_version >= "3.7" and python_version < "4.0" @@ -60,10 +60,10 @@ importlib-metadata==4.13.0 ; python_version >= "3.7" and python_version < "4.0" importlib-resources==5.10.1 ; python_version >= "3.7" and python_version < "3.9" iniconfig==1.1.1 ; python_version >= "3.7" and python_version < "4.0" invoke==1.7.3 ; python_version >= "3.7" and python_version < "4.0" -ipdb==0.13.9 ; python_version >= "3.7" and python_version < "4.0" +ipdb==0.13.11 ; python_version >= "3.7" and python_version < "4.0" ipython==7.34.0 ; python_version >= "3.7" and python_version < "4.0" isodate==0.6.1 ; python_version >= "3.7" and python_version < "4.0" -isort==5.11.0 ; python_full_version >= "3.7.2" and python_version < "4.0" +isort==5.11.3 ; python_full_version >= "3.7.2" and python_version < "4.0" jaraco-classes==3.2.3 ; python_version >= "3.7" and python_version < "4.0" jedi==0.18.2 ; python_version >= "3.7" and python_version < "4.0" jeepney==0.8.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux" @@ -71,9 +71,9 @@ jinja2==3.1.2 ; python_version >= "3.7" and python_version < "4.0" jmespath==1.0.1 ; python_version >= "3.7" and python_version < "4.0" josepy==1.13.0 ; python_version >= "3.7" and python_version < "4.0" jsonlines==3.1.0 ; python_version >= "3.7" and python_version < "4.0" -jsonpickle==2.2.0 ; python_version >= "3.7" and python_version < "4.0" +jsonpickle==3.0.1 ; python_version >= "3.7" and python_version < "4.0" jsonschema==4.17.3 ; python_version >= "3.7" and python_version < "4.0" -keyring==23.11.0 ; python_version >= "3.7" and python_version < "4.0" +keyring==23.13.1 ; python_version >= "3.7" and python_version < "4.0" lazy-object-proxy==1.8.0 ; python_full_version >= "3.7.2" and python_version < "4.0" lockfile==0.12.2 ; python_version >= "3.7" and python_version < "4.0" markupsafe==2.1.1 ; python_version >= "3.7" and python_version < "4.0" @@ -103,7 +103,7 @@ poetry-core==1.3.2 ; python_version >= "3.7" and python_version < "4.0" poetry-plugin-export==1.2.0 ; python_version >= "3.7" and python_version < "4.0" poetry==1.2.2 ; python_version >= "3.7" and python_version < "4.0" prompt-toolkit==3.0.36 ; python_version >= "3.7" and python_version < "4.0" -protobuf==4.21.11 ; python_version >= "3.7" and python_version < "4.0" +protobuf==4.21.12 ; python_version >= "3.7" and python_version < "4.0" ptyprocess==0.7.0 ; python_version >= "3.7" and python_version < "4.0" py==1.11.0 ; python_version >= "3.7" and python_version < "4.0" pyasn1-modules==0.2.8 ; python_version >= "3.7" and python_version < "4.0" @@ -124,7 +124,7 @@ pytest==7.2.0 ; python_version >= "3.7" and python_version < "4.0" python-augeas==1.1.0 ; python_version >= "3.7" and python_version < "4.0" python-dateutil==2.8.2 ; python_version >= "3.7" and python_version < "4.0" python-digitalocean==1.17.0 ; python_version >= "3.7" and python_version < "4.0" -pytz==2022.6 ; python_version >= "3.7" and python_version < "4.0" +pytz==2022.7 ; python_version >= "3.7" and python_version < "4.0" pywin32-ctypes==0.2.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32" pywin32==305 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32" pyyaml==6.0 ; python_version >= "3.7" and python_version < "4.0" @@ -155,18 +155,17 @@ sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.7" and python_version < "4.0" sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.7" and python_version < "4.0" sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.7" and python_version < "4.0" tldextract==3.4.0 ; python_version >= "3.7" and python_version < "4.0" -toml==0.10.2 ; python_version >= "3.7" and python_version < "4.0" tomli==2.0.1 ; python_version >= "3.7" and python_full_version <= "3.11.0a6" tomlkit==0.11.6 ; python_version < "4.0" and python_version >= "3.7" -tox==3.27.1 ; python_version >= "3.7" and python_version < "4.0" -traitlets==5.7.1 ; python_version >= "3.7" and python_version < "4.0" +tox==3.28.0 ; python_version >= "3.7" and python_version < "4.0" +traitlets==5.8.0 ; python_version >= "3.7" and python_version < "4.0" twine==4.0.2 ; python_version >= "3.7" and python_version < "4.0" typed-ast==1.5.4 ; python_version < "3.8" and python_version >= "3.7" types-cryptography==3.3.23.2 ; python_version >= "3.7" and python_version < "4.0" types-pyopenssl==22.1.0.2 ; python_version >= "3.7" and python_version < "4.0" types-pyrfc3339==1.1.1.1 ; python_version >= "3.7" and python_version < "4.0" -types-python-dateutil==2.8.19.4 ; python_version >= "3.7" and python_version < "4.0" -types-pytz==2022.6.0.1 ; python_version >= "3.7" and python_version < "4.0" +types-python-dateutil==2.8.19.5 ; python_version >= "3.7" and python_version < "4.0" +types-pytz==2022.7.0.0 ; python_version >= "3.7" and python_version < "4.0" types-requests==2.28.11.5 ; python_version >= "3.7" and python_version < "4.0" types-setuptools==65.6.0.2 ; python_version >= "3.7" and python_version < "4.0" types-six==1.16.21.4 ; python_version >= "3.7" and python_version < "4.0"