Skip to content

Commit

Permalink
[query] Remove unused and redundant requirements (#13988)
Browse files Browse the repository at this point in the history
`asyncinit` is unused AFAICT and the `frozenlist` requirement is already
inherited from hailtop (though it is not used in `hailtop` only in query
code, so am also happy to move it out of hailtop fully and into query).
  • Loading branch information
daniel-goldstein authored Nov 13, 2023
1 parent 21c6a40 commit 258b26f
Show file tree
Hide file tree
Showing 11 changed files with 62 additions and 73 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ hail/python/pinned-requirements.txt: hail/python/hailtop/pinned-requirements.txt
hail/python/dev/pinned-requirements.txt: hail/python/pinned-requirements.txt hail/python/dev/requirements.txt
./generate-linux-pip-lockfile.sh hail/python/dev

benchmark/python/pinned-requirements.txt: benchmark/python/requirements.txt
benchmark/python/pinned-requirements.txt: benchmark/python/requirements.txt hail/python/pinned-requirements.txt hail/python/dev/pinned-requirements.txt
./generate-linux-pip-lockfile.sh benchmark/python

gear/pinned-requirements.txt: hail/python/pinned-requirements.txt hail/python/dev/pinned-requirements.txt hail/python/hailtop/pinned-requirements.txt gear/requirements.txt
Expand Down
6 changes: 3 additions & 3 deletions batch/pinned-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ attrs==23.1.0
# -c hail/batch/../hail/python/pinned-requirements.txt
# -c hail/batch/../web_common/pinned-requirements.txt
# aiohttp
charset-normalizer==3.3.1
charset-normalizer==3.3.2
# via
# -c hail/batch/../gear/pinned-requirements.txt
# -c hail/batch/../hail/python/dev/pinned-requirements.txt
Expand Down Expand Up @@ -78,11 +78,11 @@ packaging==23.2
# -c hail/batch/../hail/python/dev/pinned-requirements.txt
# -c hail/batch/../hail/python/pinned-requirements.txt
# plotly
pandas==2.1.1
pandas==2.1.2
# via
# -c hail/batch/../hail/python/pinned-requirements.txt
# -r hail/batch/requirements.txt
plotly==5.17.0
plotly==5.18.0
# via
# -c hail/batch/../hail/python/pinned-requirements.txt
# -r hail/batch/requirements.txt
Expand Down
8 changes: 4 additions & 4 deletions benchmark/python/pinned-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#
# pip-compile --output-file=hail/benchmark/python/pinned-requirements.txt hail/benchmark/python/requirements.txt
#
contourpy==1.1.1
contourpy==1.2.0
# via
# -c hail/benchmark/python/../../hail/python/pinned-requirements.txt
# matplotlib
cycler==0.12.1
# via matplotlib
fonttools==4.43.1
fonttools==4.44.0
# via matplotlib
importlib-resources==6.1.0
importlib-resources==6.1.1
# via matplotlib
kiwisolver==1.4.5
# via matplotlib
matplotlib==3.8.0
matplotlib==3.8.1
# via -r hail/benchmark/python/requirements.txt
numpy==1.26.1
# via
Expand Down
2 changes: 1 addition & 1 deletion ci/pinned-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cffi==1.16.0
# -c hail/ci/../hail/python/dev/pinned-requirements.txt
# -c hail/ci/../hail/python/pinned-requirements.txt
# cryptography
charset-normalizer==3.3.1
charset-normalizer==3.3.2
# via
# -c hail/ci/../gear/pinned-requirements.txt
# -c hail/ci/../hail/python/dev/pinned-requirements.txt
Expand Down
16 changes: 8 additions & 8 deletions gear/pinned-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ attrs==23.1.0
# aiomonitor
backports-strenum==1.2.8
# via aiomonitor
cachetools==5.3.1
cachetools==5.3.2
# via
# -c hail/gear/../hail/python/hailtop/pinned-requirements.txt
# -c hail/gear/../hail/python/pinned-requirements.txt
Expand All @@ -53,7 +53,7 @@ certifi==2023.7.22
# -c hail/gear/../hail/python/pinned-requirements.txt
# kubernetes-asyncio
# requests
charset-normalizer==3.3.1
charset-normalizer==3.3.2
# via
# -c hail/gear/../hail/python/dev/pinned-requirements.txt
# -c hail/gear/../hail/python/hailtop/pinned-requirements.txt
Expand All @@ -73,11 +73,11 @@ frozenlist==1.4.0
# -c hail/gear/../hail/python/pinned-requirements.txt
# aiohttp
# aiosignal
google-api-core==2.12.0
google-api-core==2.13.0
# via google-api-python-client
google-api-python-client==2.105.0
google-api-python-client==2.107.0
# via google-cloud-profiler
google-auth==2.23.3
google-auth==2.23.4
# via
# -c hail/gear/../hail/python/hailtop/pinned-requirements.txt
# -c hail/gear/../hail/python/pinned-requirements.txt
Expand Down Expand Up @@ -128,14 +128,14 @@ multidict==6.0.4
# -c hail/gear/../hail/python/pinned-requirements.txt
# aiohttp
# yarl
orjson==3.9.9
orjson==3.9.10
# via
# -c hail/gear/../hail/python/hailtop/pinned-requirements.txt
# -c hail/gear/../hail/python/pinned-requirements.txt
# -r hail/gear/requirements.txt
prometheus-async==19.2.0
# via -r hail/gear/requirements.txt
prometheus-client==0.17.1
prometheus-client==0.18.0
# via
# -c hail/gear/../hail/python/dev/pinned-requirements.txt
# -r hail/gear/requirements.txt
Expand Down Expand Up @@ -223,7 +223,7 @@ urllib3==1.26.18
# -c hail/gear/../hail/python/pinned-requirements.txt
# kubernetes-asyncio
# requests
wcwidth==0.2.8
wcwidth==0.2.9
# via
# -c hail/gear/../hail/python/dev/pinned-requirements.txt
# prompt-toolkit
Expand Down
52 changes: 23 additions & 29 deletions hail/python/dev/pinned-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ babel==2.13.1
# via
# jupyterlab-server
# sphinx
backcall==0.2.0
# via ipython
beautifulsoup4==4.12.2
# via nbconvert
black==22.12.0
Expand All @@ -67,7 +65,7 @@ cffi==1.16.0
# argon2-cffi-bindings
cfgv==3.4.0
# via pre-commit
charset-normalizer==3.3.1
charset-normalizer==3.3.2
# via
# -c hail/hail/python/dev/../pinned-requirements.txt
# aiohttp
Expand All @@ -79,7 +77,7 @@ click==8.1.7
# aiohttp-devtools
# black
# curlylint
comm==0.1.4
comm==0.2.0
# via
# ipykernel
# ipywidgets
Expand Down Expand Up @@ -113,13 +111,13 @@ exceptiongroup==1.1.3
# pytest
execnet==2.0.2
# via pytest-xdist
executing==2.0.0
executing==2.0.1
# via
# devtools
# stack-data
fastjsonschema==2.18.1
# via nbformat
filelock==3.12.4
filelock==3.13.1
# via virtualenv
fqdn==1.5.1
# via jsonschema
Expand All @@ -130,7 +128,7 @@ frozenlist==1.4.0
# aiosignal
fswatch==0.1.1
# via -r hail/hail/python/dev/requirements.txt
identify==2.5.30
identify==2.5.31
# via pre-commit
idna==3.4
# via
Expand All @@ -157,13 +155,11 @@ ipykernel==6.26.0
# jupyter-console
# jupyterlab
# qtconsole
ipython==8.16.1
ipython==8.17.2
# via
# ipykernel
# ipywidgets
# jupyter-console
ipython-genutils==0.2.0
# via qtconsole
ipywidgets==8.1.1
# via jupyter
isoduration==20.11.0
Expand All @@ -185,7 +181,7 @@ json5==0.9.14
# via jupyterlab-server
jsonpointer==2.4
# via jsonschema
jsonschema[format-nongpl]==4.19.1
jsonschema[format-nongpl]==4.19.2
# via
# jupyter-events
# jupyterlab-server
Expand All @@ -194,7 +190,7 @@ jsonschema-specifications==2023.7.1
# via jsonschema
jupyter==1.0.0
# via -r hail/hail/python/dev/requirements.txt
jupyter-client==8.5.0
jupyter-client==8.6.0
# via
# ipykernel
# jupyter-console
Expand All @@ -203,7 +199,7 @@ jupyter-client==8.5.0
# qtconsole
jupyter-console==6.6.3
# via jupyter
jupyter-core==5.4.0
jupyter-core==5.5.0
# via
# ipykernel
# jupyter-client
Expand All @@ -214,11 +210,11 @@ jupyter-core==5.4.0
# nbconvert
# nbformat
# qtconsole
jupyter-events==0.8.0
jupyter-events==0.9.0
# via jupyter-server
jupyter-lsp==2.2.0
# via jupyterlab
jupyter-server==2.9.1
jupyter-server==2.10.0
# via
# jupyter-lsp
# jupyterlab
Expand All @@ -227,7 +223,7 @@ jupyter-server==2.9.1
# notebook-shim
jupyter-server-terminals==0.4.4
# via jupyter-server
jupyterlab==4.0.7
jupyterlab==4.0.8
# via notebook
jupyterlab-pygments==0.2.2
# via nbconvert
Expand Down Expand Up @@ -259,9 +255,9 @@ multidict==6.0.4
# yarl
mypy-extensions==1.0.0
# via black
nbclient==0.8.0
nbclient==0.9.0
# via nbconvert
nbconvert==7.9.2
nbconvert==7.11.0
# via
# jupyter
# jupyter-server
Expand Down Expand Up @@ -314,8 +310,6 @@ pathspec==0.11.2
# curlylint
pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
pillow==10.1.0
# via
# -c hail/hail/python/dev/../pinned-requirements.txt
Expand All @@ -330,7 +324,7 @@ pluggy==1.3.0
# via pytest
pre-commit==3.5.0
# via -r hail/hail/python/dev/requirements.txt
prometheus-client==0.17.1
prometheus-client==0.18.0
# via jupyter-server
prompt-toolkit==3.0.39
# via
Expand Down Expand Up @@ -362,7 +356,7 @@ pygments==2.16.1
# sphinx
pylint==2.17.7
# via -r hail/hail/python/dev/requirements.txt
pyright==1.1.333
pyright==1.1.334
# via -r hail/hail/python/dev/requirements.txt
pytest==7.4.3
# via
Expand Down Expand Up @@ -411,7 +405,7 @@ pyzmq==25.1.1
# jupyter-console
# jupyter-server
# qtconsole
qtconsole==5.4.4
qtconsole==5.5.0
# via jupyter
qtpy==2.4.1
# via qtconsole
Expand All @@ -433,11 +427,11 @@ rfc3986-validator==0.1.1
# via
# jsonschema
# jupyter-events
rpds-py==0.10.6
rpds-py==0.12.0
# via
# jsonschema
# referencing
ruff==0.1.2
ruff==0.1.4
# via -r hail/hail/python/dev/requirements.txt
send2trash==1.8.2
# via jupyter-server
Expand Down Expand Up @@ -503,7 +497,7 @@ tomli==2.0.1
# jupyterlab
# pylint
# pytest
tomlkit==0.12.1
tomlkit==0.12.2
# via pylint
tornado==6.3.3
# via
Expand All @@ -514,7 +508,7 @@ tornado==6.3.3
# jupyterlab
# notebook
# terminado
traitlets==5.12.0
traitlets==5.13.0
# via
# comm
# ipykernel
Expand Down Expand Up @@ -576,7 +570,7 @@ virtualenv==20.24.6
# via pre-commit
watchfiles==0.21.0
# via aiohttp-devtools
wcwidth==0.2.8
wcwidth==0.2.9
# via prompt-toolkit
webcolors==1.13
# via jsonschema
Expand All @@ -586,7 +580,7 @@ webencodings==0.5.1
# tinycss2
websocket-client==1.6.4
# via jupyter-server
wheel==0.41.2
wheel==0.41.3
# via -r hail/hail/python/dev/requirements.txt
widgetsnbextension==4.0.9
# via ipywidgets
Expand Down
2 changes: 1 addition & 1 deletion hail/python/hailtop/config/deploy_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def with_default_namespace(self, default_namespace):
def with_location(self, location):
return DeployConfig(location, self._default_namespace, self._domain)

def default_namespace(self):
def default_namespace(self) -> str:
return self._default_namespace

def location(self):
Expand Down
Loading

0 comments on commit 258b26f

Please sign in to comment.