Skip to content

Commit

Permalink
[misc] Remove wheel dependence on setuptools (#14631)
Browse files Browse the repository at this point in the history
`hail` had a transitive dependency on `setuptools` via an ancient
version of `humanize` that's removed by upgrading to the latest major
revision.
Bump `humanize` to major revision `4` and regenerate lock files.

Fixes #14630
  • Loading branch information
ehigham authored Jul 30, 2024
1 parent ba793be commit ee6d17e
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions batch/pinned-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --python-version 3.9 --python-platform linux batch/requirements.txt --output-file=batch/pinned-requirements.txt
aiodocker==0.22.0
aiodocker==0.22.2
# via -r batch/requirements.txt
aiohttp==3.9.5
# via
Expand Down Expand Up @@ -92,7 +92,7 @@ six==1.16.0
# -c batch/../hail/python/dev/pinned-requirements.txt
# -c batch/../hail/python/pinned-requirements.txt
# python-dateutil
tenacity==8.4.2
tenacity==8.5.0
# via
# -c batch/../hail/python/pinned-requirements.txt
# plotly
Expand Down
4 changes: 2 additions & 2 deletions ci/pinned-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file was autogenerated by uv via the following command:
# uv pip compile --python-version 3.9 --python-platform linux ci/requirements.txt --output-file=ci/pinned-requirements.txt
certifi==2024.6.2
certifi==2024.7.4
# via
# -c ci/../gear/pinned-requirements.txt
# -c ci/../hail/python/dev/pinned-requirements.txt
Expand All @@ -22,7 +22,7 @@ click==8.1.7
# -c ci/../hail/python/dev/pinned-requirements.txt
# -c ci/../hail/python/pinned-requirements.txt
# zulip
cryptography==42.0.8
cryptography==43.0.0
# via
# -c ci/../hail/python/pinned-requirements.txt
# pyjwt
Expand Down
10 changes: 5 additions & 5 deletions gear/pinned-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ attrs==23.2.0
# -c gear/../hail/python/hailtop/pinned-requirements.txt
# -c gear/../hail/python/pinned-requirements.txt
# aiohttp
cachetools==5.3.3
cachetools==5.4.0
# via
# -c gear/../hail/python/hailtop/pinned-requirements.txt
# -c gear/../hail/python/pinned-requirements.txt
# google-auth
certifi==2024.6.2
certifi==2024.7.4
# via
# -c gear/../hail/python/dev/pinned-requirements.txt
# -c gear/../hail/python/hailtop/pinned-requirements.txt
Expand All @@ -56,9 +56,9 @@ frozenlist==1.4.1
# aiosignal
google-api-core==2.19.1
# via google-api-python-client
google-api-python-client==2.136.0
google-api-python-client==2.137.0
# via google-cloud-profiler
google-auth==2.31.0
google-auth==2.32.0
# via
# -c gear/../hail/python/hailtop/pinned-requirements.txt
# -c gear/../hail/python/pinned-requirements.txt
Expand Down Expand Up @@ -154,7 +154,7 @@ rsa==4.9
# -c gear/../hail/python/hailtop/pinned-requirements.txt
# -c gear/../hail/python/pinned-requirements.txt
# google-auth
setuptools==70.2.0
setuptools==71.1.0
# via
# -c gear/../hail/python/dev/pinned-requirements.txt
# kubernetes-asyncio
Expand Down
36 changes: 18 additions & 18 deletions hail/python/dev/pinned-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ bleach==6.1.0
# via nbconvert
build==1.1.1
# via -r hail/python/dev/requirements.txt
certifi==2024.6.2
certifi==2024.7.4
# via
# -c hail/python/dev/../pinned-requirements.txt
# httpcore
Expand Down Expand Up @@ -107,7 +107,7 @@ docutils==0.18.1
# nbsphinx
# sphinx
# sphinx-rtd-theme
exceptiongroup==1.2.1
exceptiongroup==1.2.2
# via
# anyio
# ipython
Expand All @@ -122,7 +122,7 @@ fastjsonschema==2.20.0
# via nbformat
filelock==3.15.4
# via virtualenv
fonttools==4.53.0
fonttools==4.53.1
# via matplotlib
fqdn==1.5.1
# via jsonschema
Expand All @@ -139,7 +139,7 @@ httpcore==1.0.5
# via httpx
httpx==0.27.0
# via jupyterlab
identify==2.5.36
identify==2.6.0
# via pre-commit
idna==3.7
# via
Expand Down Expand Up @@ -196,7 +196,7 @@ json5==0.9.25
# via jupyterlab-server
jsonpointer==3.0.0
# via jsonschema
jsonschema==4.22.0
jsonschema==4.23.0
# via
# jupyter-events
# jupyterlab-server
Expand Down Expand Up @@ -229,7 +229,7 @@ jupyter-events==0.10.0
# via jupyter-server
jupyter-lsp==2.2.5
# via jupyterlab
jupyter-server==2.14.1
jupyter-server==2.14.2
# via
# jupyter-lsp
# jupyterlab
Expand All @@ -238,11 +238,11 @@ jupyter-server==2.14.1
# notebook-shim
jupyter-server-terminals==0.5.3
# via jupyter-server
jupyterlab==4.2.3
jupyterlab==4.2.4
# via notebook
jupyterlab-pygments==0.3.0
# via nbconvert
jupyterlab-server==2.27.2
jupyterlab-server==2.27.3
# via
# jupyterlab
# notebook
Expand All @@ -257,7 +257,7 @@ markupsafe==2.1.5
# -c hail/python/dev/../pinned-requirements.txt
# jinja2
# nbconvert
matplotlib==3.9.0
matplotlib==3.9.1
# via -r hail/python/dev/requirements.txt
matplotlib-inline==0.1.7
# via
Expand Down Expand Up @@ -361,7 +361,7 @@ ptyprocess==0.7.0
# via
# pexpect
# terminado
pure-eval==0.2.2
pure-eval==0.2.3
# via stack-data
py==1.11.0
# via pytest-forked
Expand All @@ -385,7 +385,7 @@ pyparsing==3.1.2
# via matplotlib
pyproject-hooks==1.1.0
# via build
pyright==1.1.370
pyright==1.1.372
# via -r hail/python/dev/requirements.txt
pytest==7.4.4
# via
Expand Down Expand Up @@ -460,15 +460,15 @@ rfc3986-validator==0.1.1
# via
# jsonschema
# jupyter-events
rpds-py==0.18.1
rpds-py==0.19.0
# via
# jsonschema
# referencing
ruff==0.1.13
# via -r hail/python/dev/requirements.txt
send2trash==1.8.3
# via jupyter-server
setuptools==70.2.0
setuptools==71.1.0
# via jupyterlab
six==1.16.0
# via
Expand Down Expand Up @@ -501,15 +501,15 @@ sphinxcontrib-applehelp==1.0.8
# via sphinx
sphinxcontrib-devhelp==1.0.6
# via sphinx
sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-htmlhelp==2.0.6
# via sphinx
sphinxcontrib-jquery==4.1
# via sphinx-rtd-theme
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-katex==0.9.10
# via -r hail/python/dev/requirements.txt
sphinxcontrib-qthelp==1.0.7
sphinxcontrib-qthelp==1.0.8
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
Expand All @@ -529,7 +529,7 @@ tomli==2.0.1
# jupyterlab
# pylint
# pytest
tomlkit==0.12.5
tomlkit==0.13.0
# via pylint
tornado==6.4.1
# via
Expand Down Expand Up @@ -574,7 +574,7 @@ types-pyyaml==6.0.12.20240311
# via -r hail/python/dev/requirements.txt
types-requests==2.31.0.6
# via -r hail/python/dev/requirements.txt
types-setuptools==70.1.0.20240627
types-setuptools==71.0.0.20240722
# via -r hail/python/dev/requirements.txt
types-six==1.16.21.20240513
# via -r hail/python/dev/requirements.txt
Expand All @@ -598,7 +598,7 @@ urllib3==1.26.19
# via
# -c hail/python/dev/../pinned-requirements.txt
# requests
uv==0.2.21
uv==0.2.27
# via -r hail/python/dev/requirements.txt
virtualenv==20.26.3
# via pre-commit
Expand Down
22 changes: 11 additions & 11 deletions hail/python/hailtop/pinned-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ azure-mgmt-core==1.4.0
# via azure-mgmt-storage
azure-mgmt-storage==20.1.0
# via -r hail/python/hailtop/requirements.txt
azure-storage-blob==12.20.0
azure-storage-blob==12.21.0
# via -r hail/python/hailtop/requirements.txt
boto3==1.34.138
boto3==1.34.145
# via -r hail/python/hailtop/requirements.txt
botocore==1.34.138
botocore==1.34.145
# via
# -r hail/python/hailtop/requirements.txt
# boto3
# s3transfer
cachetools==5.3.3
cachetools==5.4.0
# via google-auth
certifi==2024.6.2
certifi==2024.7.4
# via
# msrest
# requests
Expand All @@ -49,7 +49,7 @@ click==8.1.7
# via typer
commonmark==0.9.1
# via rich
cryptography==42.0.8
cryptography==43.0.0
# via
# azure-identity
# azure-storage-blob
Expand All @@ -62,13 +62,13 @@ frozenlist==1.4.1
# -r hail/python/hailtop/requirements.txt
# aiohttp
# aiosignal
google-auth==2.31.0
google-auth==2.32.0
# via
# -r hail/python/hailtop/requirements.txt
# google-auth-oauthlib
google-auth-oauthlib==0.8.0
# via -r hail/python/hailtop/requirements.txt
humanize==1.1.0
humanize==4.10.0
# via -r hail/python/hailtop/requirements.txt
idna==3.7
# via
Expand All @@ -84,9 +84,9 @@ jmespath==1.0.1
# via
# boto3
# botocore
jproperties==2.1.1
jproperties==2.1.2
# via -r hail/python/hailtop/requirements.txt
msal==1.29.0
msal==1.30.0
# via
# azure-identity
# msal-extensions
Expand All @@ -104,7 +104,7 @@ oauthlib==3.2.2
# via requests-oauthlib
orjson==3.10.6
# via -r hail/python/hailtop/requirements.txt
portalocker==2.10.0
portalocker==2.10.1
# via msal-extensions
pyasn1==0.6.0
# via
Expand Down
2 changes: 1 addition & 1 deletion hail/python/hailtop/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dill>=0.3.6,<0.4
frozenlist>=1.3.1,<2
google-auth>=2.14.1,<3
google-auth-oauthlib>=0.5.2,<1
humanize>=1.0.0,<2
humanize>=4.0,<5
janus>=0.6,<1.1
nest_asyncio>=1.5.8,<2
orjson>=3.9.15,<4
Expand Down
Loading

0 comments on commit ee6d17e

Please sign in to comment.