From ee2f5f5a0a1770c85c6740388dbbe93208fa148f Mon Sep 17 00:00:00 2001 From: alexzorin Date: Sat, 12 Mar 2022 09:04:09 +1100 Subject: pinning: work around poetry crash caused by bad 3rd party constraint (#9229) --- tools/oldest_constraints.txt | 34 ++++++++++++++++------------------ tools/pinning/current/pyproject.toml | 5 +++++ tools/pinning/oldest/pyproject.toml | 6 ++++++ tools/requirements.txt | 36 +++++++++++++++++------------------- 4 files changed, 44 insertions(+), 37 deletions(-) diff --git a/tools/oldest_constraints.txt b/tools/oldest_constraints.txt index 9b25d99f5..48a14d0c5 100644 --- a/tools/oldest_constraints.txt +++ b/tools/oldest_constraints.txt @@ -13,10 +13,10 @@ certifi==2021.10.8; python_version >= "3.7" and python_full_version < "3.0.0" or cffi==1.9.1 chardet==3.0.4 cloudflare==1.5.1 -colorama==0.4.4; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or python_full_version >= "3.5.0" and python_version >= "3.7" and sys_platform == "win32" or python_version >= "3.7" and python_full_version >= "3.6.2" and sys_platform == "win32" +colorama==0.4.4; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or python_full_version >= "3.5.0" and python_version >= "3.7" and sys_platform == "win32" or sys_platform == "win32" and python_full_version >= "3.6.2" and python_version >= "3.7" configargparse==0.10.0 configobj==5.0.6 -coverage==6.3.1; python_version >= "3.7" or python_version >= "3.7" +coverage==6.3.2; python_version >= "3.7" or python_version >= "3.7" cryptography==3.2.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") cython==0.29.28; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") distlib==0.3.4; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.5.0" @@ -34,12 +34,12 @@ future==0.18.2; python_version >= "3.7" and python_full_version < "3.0.0" or pyt google-api-python-client==1.5.5 httplib2==0.9.2 idna==2.6 -importlib-metadata==4.11.1; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.4.0" and python_version >= "3.7" and python_version < "3.8" or python_version < "3.8" and python_version >= "3.7" or python_version >= "3.7" and python_full_version >= "3.5.0" and python_version < "3.8" +importlib-metadata==4.11.2; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.4.0" and python_version >= "3.7" and python_version < "3.8" or python_version < "3.8" and python_version >= "3.7" or python_version >= "3.7" and python_full_version >= "3.5.0" and python_version < "3.8" iniconfig==1.1.1; python_version >= "3.7" ipaddress==1.0.16 isort==5.10.1; python_full_version >= "3.6.2" and python_version < "4.0" and python_version >= "3.7" jmespath==0.10.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7" -josepy==1.12.0; python_version >= "3.7" +josepy==1.13.0; python_version >= "3.7" jsonschema==3.2.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" lazy-object-proxy==1.7.1; python_version >= "3.7" and python_full_version >= "3.6.2" logger==1.4; python_version >= "3.7" @@ -53,15 +53,15 @@ packaging==21.3; python_version >= "3.7" paramiko==2.9.2; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" parsedatetime==2.4 pbr==1.8.0 -pip==22.0.3; python_version >= "3.7" -platformdirs==2.5.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.5.0" or python_version >= "3.7" and python_full_version >= "3.6.2" +pip==22.0.4; python_version >= "3.7" +platformdirs==2.5.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.5.0" or python_version >= "3.7" and python_full_version >= "3.6.2" pluggy==1.0.0; python_version >= "3.7" ply==3.4 py==1.11.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" pyasn1-modules==0.0.10; python_version >= "3.7" pyasn1==0.1.9 pycparser==2.14 -pylint==2.12.2; python_version >= "3.7" and python_full_version >= "3.6.2" +pylint==2.12.2; python_full_version >= "3.6.2" pynacl==1.5.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" pyopenssl==17.3.0 pyparsing==2.2.1; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") @@ -86,27 +86,25 @@ s3transfer==0.3.7; python_version >= "3.7" setuptools==41.6.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") six==1.11.0 texttable==1.6.4; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" -tldextract==3.1.2; python_version >= "3.7" +tldextract==3.2.0; python_version >= "3.7" toml==0.10.2; python_version >= "3.7" and python_full_version >= "3.6.2" tomli==2.0.1; python_version >= "3.7" or python_version >= "3.7" tox==1.9.2; python_version >= "3.7" typed-ast==1.5.2; python_version >= "3.7" and python_version < "3.8" or implementation_name == "cpython" and python_version < "3.8" and python_version >= "3.7" and python_full_version >= "3.6.2" -types-cryptography==3.3.15; python_version >= "3.7" -types-enum34==1.1.8; python_version >= "3.7" -types-ipaddress==1.0.8; python_version >= "3.7" -types-mock==4.0.10; python_version >= "3.7" +types-cryptography==3.3.18; python_version >= "3.7" +types-mock==4.0.11; python_version >= "3.7" types-pyopenssl==22.0.0; python_version >= "3.7" types-pyrfc3339==1.1.1; python_version >= "3.7" types-python-dateutil==2.8.9; python_version >= "3.7" types-pytz==2021.3.5; python_version >= "3.7" -types-requests==2.27.10; python_version >= "3.7" -types-setuptools==57.4.9; python_version >= "3.7" -types-six==1.16.10; python_version >= "3.7" -types-urllib3==1.26.9; python_version >= "3.7" -typing-extensions==4.1.1; python_version >= "3.7" or python_version >= "3.7" and python_full_version >= "3.6.2" and python_version < "3.10" or python_version < "3.8" and python_version >= "3.7" +types-requests==2.27.11; python_version >= "3.7" +types-setuptools==57.4.10; python_version >= "3.7" +types-six==1.16.12; python_version >= "3.7" +types-urllib3==1.26.10; python_version >= "3.7" +typing-extensions==4.1.1; python_version >= "3.7" or python_version < "3.10" and python_full_version >= "3.6.2" and python_version >= "3.7" or python_version < "3.8" and python_version >= "3.7" uritemplate==3.0.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" urllib3==1.24.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0" and python_version < "4") -virtualenv==20.13.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.5.0" +virtualenv==20.13.3; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.5.0" websocket-client==0.59.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" or python_full_version >= "3.5.0" and python_version >= "3.7" wheel==0.33.6; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") wrapt==1.13.3; python_version >= "3.7" and python_full_version >= "3.6.2" diff --git a/tools/pinning/current/pyproject.toml b/tools/pinning/current/pyproject.toml index 811301ae4..c09f89806 100644 --- a/tools/pinning/current/pyproject.toml +++ b/tools/pinning/current/pyproject.toml @@ -69,6 +69,11 @@ poetry = ">=1.2.0a1" # point, it's probably worth enumerating and pinning them (and recursing to # THEIR build dependencies) as well. setuptools-rust = "*" +# A bad python_requires constraint in pylint 2.6.2 can sometimes crash poetry +# before it has finished resolving. No newer releases have the same issue. Remove +# this once we can upgrade to a release of Poetry containing this commit: +# https://github.com/python-poetry/poetry-core/commit/4e1f2ab582d1fef0033c0d3f35a3f2f2365a4bc9 +pylint = ">2.6.2" [tool.poetry.dev-dependencies] diff --git a/tools/pinning/oldest/pyproject.toml b/tools/pinning/oldest/pyproject.toml index 205c3c47d..230410b5d 100644 --- a/tools/pinning/oldest/pyproject.toml +++ b/tools/pinning/oldest/pyproject.toml @@ -104,6 +104,12 @@ cython = "*" # wheel 0.34.0 is buggy). wheel = "<0.34.0" +# A bad python_requires constraint in pylint 2.6.2 can sometimes crash poetry +# before it has finished resolving. No newer releases have the same issue. Remove +# this once we can upgrade to a release of Poetry containing this commit: +# https://github.com/python-poetry/poetry-core/commit/4e1f2ab582d1fef0033c0d3f35a3f2f2365a4bc9 +pylint = ">2.6.2" + [tool.poetry.dev-dependencies] [build-system] diff --git a/tools/requirements.txt b/tools/requirements.txt index 8477fe08d..175a8c880 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -12,15 +12,15 @@ appnope==0.1.2; python_version >= "3.7" and sys_platform == "darwin" astroid==2.9.3; python_version >= "3.7" and python_full_version >= "3.6.2" atomicwrites==1.4.0; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.7" and python_full_version >= "3.4.0" attrs==21.4.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" -awscli==1.22.64; python_version >= "3.6" +awscli==1.22.72; python_version >= "3.6" azure-devops==6.0.0b4; python_version >= "3.7" babel==2.9.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.4.0" backcall==0.2.0; python_version >= "3.7" bcrypt==3.2.0; python_version >= "3.7" beautifulsoup4==4.10.0; python_full_version > "3.0.0" and python_version >= "3.7" or python_version >= "3.7" and python_version < "4.0" and python_full_version > "3.0.0" bleach==4.1.0; python_version >= "3.7" -boto3==1.21.9; python_version >= "3.7" -botocore==1.24.9; python_version >= "3.7" +boto3==1.21.17; python_version >= "3.7" +botocore==1.24.17; python_version >= "3.7" cachecontrol==0.12.10; python_version >= "3.7" and python_version < "4.0" cached-property==1.5.2; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" cachetools==5.0.0; python_version >= "3.7" and python_version < "4.0" and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7") @@ -30,7 +30,7 @@ cffi==1.15.0; python_version >= "3.7" or python_version >= "3.7" charset-normalizer==2.0.12; python_full_version >= "3.6.0" and python_version >= "3.7" cleo==1.0.0a4; python_version >= "3.7" and python_version < "4.0" cloudflare==2.8.15; python_version >= "3.7" -colorama==0.4.3; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" or python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or python_full_version >= "3.5.0" and python_version >= "3.7" and sys_platform == "win32" or python_version >= "3.7" and python_full_version >= "3.6.2" and sys_platform == "win32" or python_version >= "3.7" and python_full_version < "3.0.0" and platform_system == "Windows" or python_version >= "3.7" and python_full_version >= "3.5.0" and platform_system == "Windows" +colorama==0.4.3; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" or sys_platform == "win32" and python_full_version >= "3.6.2" and python_version >= "3.7" or python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or python_full_version >= "3.5.0" and python_version >= "3.7" and sys_platform == "win32" or python_version >= "3.7" and python_full_version < "3.0.0" and platform_system == "Windows" or python_version >= "3.7" and python_full_version >= "3.5.0" and platform_system == "Windows" configargparse==1.5.3; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" configobj==5.0.6; python_version >= "3.7" coverage==6.3.2; python_version >= "3.7" or python_version >= "3.7" @@ -42,7 +42,7 @@ deprecated==1.2.13; python_version >= "3.7" and python_full_version < "3.0.0" or distlib==0.3.4; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.4.0" or python_version >= "3.7" distro==1.7.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" or python_version >= "3.7" dns-lexicon==3.9.4; python_version >= "3.7" and python_version < "4.0" -dnspython==2.2.0; python_version >= "3.7" and python_version < "4.0" +dnspython==2.2.1; python_version >= "3.7" and python_version < "4.0" docker-compose==1.26.2; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" docker==4.2.2; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" dockerpty==0.4.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" @@ -52,8 +52,8 @@ entrypoints==0.3; python_version >= "3.7" and python_version < "4.0" execnet==1.9.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" fabric==2.6.0; python_version >= "3.7" filelock==3.6.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.5.0" or python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.4.0" or python_version >= "3.7" and python_version < "4.0" -google-api-core==2.5.0; python_version >= "3.7" -google-api-python-client==2.38.0; python_version >= "3.7" +google-api-core==2.7.1; python_version >= "3.7" +google-api-python-client==2.40.0; python_version >= "3.7" google-auth-httplib2==0.1.0; python_version >= "3.7" google-auth==2.6.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7" googleapis-common-protos==1.55.0; python_version >= "3.7" @@ -72,7 +72,7 @@ jedi==0.18.1; python_version >= "3.7" jeepney==0.7.1; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux" jinja2==3.0.3; python_version >= "3.7" or python_version >= "3.7" jmespath==0.10.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7" -josepy==1.12.0; python_version >= "3.7" +josepy==1.13.0; python_version >= "3.7" jsonlines==3.0.0; python_version >= "3.7" jsonpickle==2.1.0; python_version >= "3.7" jsonschema==3.2.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" @@ -96,12 +96,12 @@ parso==0.8.3; python_version >= "3.7" pathlib2==2.3.7.post1; python_version >= "3.7" pexpect==4.8.0; python_version >= "3.7" and python_version < "4.0" or python_version >= "3.7" and sys_platform != "win32" pickleshare==0.7.5; python_version >= "3.7" -pip==22.0.3; python_version >= "3.7" +pip==22.0.4; python_version >= "3.7" pkginfo==1.8.2; python_version >= "3.7" and python_version < "4.0" or python_version >= "3.7" platformdirs==2.5.1; python_version >= "3.7" and python_full_version >= "3.6.2" pluggy==1.0.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.5.0" or python_version >= "3.7" ply==3.11; python_version >= "3.7" -poetry-core==1.1.0a6; python_version >= "3.7" and python_version < "4.0" +poetry-core==1.1.0a7; python_version >= "3.7" and python_version < "4.0" poetry==1.2.0a2; python_version >= "3.6" and python_version < "4.0" prompt-toolkit==3.0.28; python_version >= "3.7" and python_full_version >= "3.6.2" protobuf==3.19.4; python_version >= "3.7" @@ -114,7 +114,7 @@ pygithub==1.55; python_version >= "3.7" pygments==2.11.2; python_version >= "3.7" pyjwt==2.3.0; python_version >= "3.7" pylev==1.4.0; python_version >= "3.7" and python_version < "4.0" -pylint==2.12.2; python_version >= "3.7" and python_full_version >= "3.6.2" +pylint==2.12.2; python_full_version >= "3.6.2" pynacl==1.5.0; python_version >= "3.7" or python_version >= "3.7" pynsist==2.7; python_version >= "3.7" pyopenssl==22.0.0; python_version >= "3.7" @@ -134,7 +134,7 @@ pytz==2021.3; python_version >= "3.7" and python_full_version < "3.0.0" or pytho pywin32-ctypes==0.2.0; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32" pywin32==303; sys_platform == "win32" and python_version >= "3.7" or sys_platform == "win32" and python_version >= "3.6" and (python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7") pyyaml==5.4.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.7" or python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.6.0" -readme-renderer==32.0; python_version >= "3.7" +readme-renderer==33.0; python_version >= "3.7" requests-download==0.1.2; python_version >= "3.7" requests-file==1.5.1; python_version >= "3.7" and python_version < "4.0" requests-oauthlib==1.3.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.4.0" @@ -146,7 +146,7 @@ s3transfer==0.5.2; python_version >= "3.7" secretstorage==3.3.1; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux" semantic-version==2.9.0; python_version >= "3.6" setuptools-rust==1.1.2; python_version >= "3.6" -setuptools==60.9.3; python_version >= "3.7" or python_version >= "3.7" or python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" or python_full_version >= "3.4.0" and python_version >= "3.7" or python_version >= "3.7" and python_full_version >= "3.6.2" +setuptools==60.9.3; python_version >= "3.7" or python_version >= "3.7" or python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" or python_version >= "3.7" and python_full_version >= "3.6.2" or python_full_version >= "3.4.0" and python_version >= "3.7" shellingham==1.4.0; python_version >= "3.7" and python_version < "4.0" six==1.16.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7" or python_full_version >= "3.3.0" and python_version >= "3.7" or python_version >= "3.7" and python_full_version >= "3.5.0" or python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.5.0" or python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.4.0" or python_full_version >= "3.6.0" and python_version >= "3.7" or python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.3.0" snowballstemmer==2.2.0; python_version >= "3.7" @@ -169,19 +169,17 @@ tqdm==4.63.0; python_version >= "3.7" and python_full_version < "3.0.0" or pytho traitlets==5.1.1; python_version >= "3.7" twine==3.3.0; python_version >= "3.7" typed-ast==1.5.2; python_version >= "3.7" and python_version < "3.8" or implementation_name == "cpython" and python_version < "3.8" and python_version >= "3.7" and python_full_version >= "3.6.2" -types-cryptography==3.3.15; python_version >= "3.7" -types-enum34==1.1.8; python_version >= "3.7" -types-ipaddress==1.0.8; python_version >= "3.7" +types-cryptography==3.3.18; python_version >= "3.7" types-mock==4.0.11; python_version >= "3.7" types-pyopenssl==22.0.0; python_version >= "3.7" types-pyrfc3339==1.1.1; python_version >= "3.7" types-python-dateutil==2.8.9; python_version >= "3.7" types-pytz==2021.3.5; python_version >= "3.7" types-requests==2.27.11; python_version >= "3.7" -types-setuptools==57.4.9; python_version >= "3.7" -types-six==1.16.10; python_version >= "3.7" +types-setuptools==57.4.10; python_version >= "3.7" +types-six==1.16.12; python_version >= "3.7" types-urllib3==1.26.10; python_version >= "3.7" -typing-extensions==4.1.1; python_version >= "3.7" or python_version >= "3.6" or python_version >= "3.7" and python_full_version >= "3.6.2" and python_version < "3.10" or python_version < "3.8" and python_version >= "3.7" +typing-extensions==4.1.1; python_version >= "3.7" or python_version >= "3.6" or python_version < "3.10" and python_full_version >= "3.6.2" and python_version >= "3.7" or python_version < "3.8" and python_version >= "3.7" uritemplate==4.1.1; python_version >= "3.7" urllib3==1.26.8; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.7" virtualenv==20.4.4; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.4.0" or python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.5.0" -- cgit v1.2.3