Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[query] Python 3.8, Numpy 1.24.2, Bokeh 3.x.x, fixes to plots.py, fixes to req generation #12929

Merged
merged 29 commits into from May 2, 2023
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
1e30a6b
[query] require bokeh 3.x.x & many fixes to plots.py
danking Apr 24, 2023
d5097e0
repin
danking Apr 24, 2023
d8c716e
update locks
danking Apr 24, 2023
e126454
Bump numpy from 1.21.6 to 1.24.2 in /hail/python/dev
dependabot[bot] Apr 17, 2023
86550f7
[all][query] update to Python3.8 which allows for numpy 1.24.2
danking Apr 19, 2023
463a2a1
add verbiage about python version policy
danking Apr 19, 2023
4f8b2ae
update pip-tools to accomodate new pip from new python
danking Apr 19, 2023
a3ddfb6
update pins and fix dependencies of Makefile
danking Apr 20, 2023
0df8def
finally resolve all the dependency conflicts
danking Apr 21, 2023
c71c260
fixed
danking Apr 21, 2023
e141024
so many more issues
danking Apr 24, 2023
2583930
consttrain dev/requirements to non-dev pins
danking Apr 24, 2023
6b5dea6
fix
danking Apr 24, 2023
44f12e1
fix
danking Apr 24, 2023
c1ced04
fix
danking Apr 24, 2023
bc59115
Merge branch 'python3.8-numpy-1.24.2' into pandas-2-python3.8-numpy-1.24
danking Apr 24, 2023
fc7077b
fix intersphinx
danking Apr 24, 2023
691d7ca
fixes
danking Apr 24, 2023
8f06d15
last fix to assertions in joint_plot
danking Apr 25, 2023
7347844
no deprecated numpy use
danking Apr 25, 2023
e0efb45
fix the plot_roc_curve
danking Apr 25, 2023
e93e452
wip
danking Apr 25, 2023
e1d2219
maybe fixed?
danking Apr 25, 2023
0500885
fix
danking Apr 27, 2023
cd43667
revert
danking Apr 27, 2023
44ed613
revert
danking Apr 27, 2023
460cb5a
fix
danking Apr 27, 2023
1f6ef23
fix
danking Apr 28, 2023
53dbdc1
address jmarshall's comment
danking May 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -75,13 +75,13 @@ install-dev-requirements:
hail/python/hailtop/pinned-requirements.txt: hail/python/hailtop/requirements.txt
./generate-linux-pip-lockfile.sh hail/python/hailtop

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

hail/python/dev/pinned-requirements.txt: hail/python/dev/requirements.txt hail/python/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

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

web_common/pinned-requirements.txt: gear/pinned-requirements.txt web_common/requirements.txt
Expand Down
10 changes: 5 additions & 5 deletions auth/pinned-requirements.txt
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.7
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=hail/auth/pinned-requirements.txt hail/auth/requirements.txt
#
Expand All @@ -22,7 +22,7 @@ charset-normalizer==3.1.0
# -c hail/auth/../hail/python/pinned-requirements.txt
# -c hail/auth/../web_common/pinned-requirements.txt
# requests
google-auth==2.17.2
google-auth==2.17.3
# via
# -c hail/auth/../gear/pinned-requirements.txt
# -c hail/auth/../hail/python/pinned-requirements.txt
Expand All @@ -38,13 +38,13 @@ idna==3.4
# requests
oauthlib==3.2.2
# via requests-oauthlib
pyasn1==0.4.8
pyasn1==0.5.0
# via
# -c hail/auth/../gear/pinned-requirements.txt
# -c hail/auth/../hail/python/pinned-requirements.txt
# pyasn1-modules
# rsa
pyasn1-modules==0.2.8
pyasn1-modules==0.3.0
# via
# -c hail/auth/../gear/pinned-requirements.txt
# -c hail/auth/../hail/python/pinned-requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions batch/Dockerfile.worker
Expand Up @@ -8,7 +8,7 @@ RUN hail-apt-get-install \
xfsprogs \
libyajl-dev # crun runtime dependency

RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1

{% if global.cloud == "gcp" %}
RUN echo "APT::Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \
Expand Down Expand Up @@ -39,7 +39,7 @@ RUN hail-pip-install \
-r batch-requirements.txt \
pyspark==3.3.0

ENV SPARK_HOME /usr/local/lib/python3.7/dist-packages/pyspark
ENV SPARK_HOME /usr/local/lib/python3.8/dist-packages/pyspark
ENV PATH "$PATH:$SPARK_HOME/sbin:$SPARK_HOME/bin"
ENV PYSPARK_PYTHON python3

Expand Down
29 changes: 11 additions & 18 deletions batch/pinned-requirements.txt
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.7
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=hail/batch/pinned-requirements.txt hail/batch/requirements.txt
#
Expand All @@ -27,13 +27,7 @@ async-timeout==4.0.2
# -c hail/batch/../web_common/pinned-requirements.txt
# -r hail/batch/requirements.txt
# aiohttp
asynctest==0.13.0
# via
# -c hail/batch/../gear/pinned-requirements.txt
# -c hail/batch/../hail/python/pinned-requirements.txt
# -c hail/batch/../web_common/pinned-requirements.txt
# aiohttp
attrs==22.2.0
attrs==23.1.0
# via
# -c hail/batch/../gear/pinned-requirements.txt
# -c hail/batch/../hail/python/dev/pinned-requirements.txt
Expand Down Expand Up @@ -70,17 +64,17 @@ multidict==6.0.4
# -c hail/batch/../web_common/pinned-requirements.txt
# aiohttp
# yarl
numpy==1.21.6
numpy==1.24.3
# via
# -c hail/batch/../hail/python/dev/pinned-requirements.txt
# -c hail/batch/../hail/python/pinned-requirements.txt
# pandas
packaging==23.0
packaging==23.1
# via
# -c hail/batch/../hail/python/dev/pinned-requirements.txt
# -c hail/batch/../hail/python/pinned-requirements.txt
# plotly
pandas==1.3.5
pandas==2.0.1
# via
# -c hail/batch/../hail/python/pinned-requirements.txt
# -r hail/batch/requirements.txt
Expand Down Expand Up @@ -111,15 +105,14 @@ tenacity==8.2.2
# plotly
typing-extensions==4.5.0
# via
# -c hail/batch/../gear/pinned-requirements.txt
# -c hail/batch/../hail/python/dev/pinned-requirements.txt
# -c hail/batch/../hail/python/pinned-requirements.txt
# -c hail/batch/../web_common/pinned-requirements.txt
# aiodocker
# aiohttp
# async-timeout
# yarl
yarl==1.8.2
tzdata==2023.3
# via
# -c hail/batch/../hail/python/pinned-requirements.txt
# pandas
yarl==1.9.1
# via
# -c hail/batch/../gear/pinned-requirements.txt
# -c hail/batch/../hail/python/pinned-requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion batch/requirements.txt
Expand Up @@ -3,7 +3,7 @@
-c ../gear/pinned-requirements.txt
-c ../web_common/pinned-requirements.txt
dictdiffer>=0.8.1,<1
pandas>=1.3.0,<1.5.0
pandas>=2,<3
plotly>=5.5.0,<6
# Worker requirements
aiodocker>=0.17.0,<1
Expand Down
2 changes: 1 addition & 1 deletion benchmark/python/setup.py
Expand Up @@ -16,7 +16,7 @@
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
],
python_requires=">=3.7",
python_requires=">=3.8",
install_requires=[
'hail>=0.2',
],
Expand Down
2 changes: 1 addition & 1 deletion build.yaml
Expand Up @@ -154,7 +154,7 @@ steps:
valueFrom: hail_ubuntu_image.image
script: |
set -ex
pip install pip-tools==6.9.0
pip install pip-tools==6.13.0
cd /io/repo
chmod 755 ./check_pip_requirements.sh
./check_pip_requirements.sh \
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.ci-utils
Expand Up @@ -20,7 +20,7 @@ RUN hail-pip-install \
-r hailtop-requirements.txt \
-r gear-requirements.txt \
twine==1.11.0 \
Jinja2==3.0.3
'Jinja2>3,<4'

FROM golang:1.18 AS skopeo-build

Expand Down
17 changes: 3 additions & 14 deletions ci/pinned-requirements.txt
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.7
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=hail/ci/pinned-requirements.txt hail/ci/requirements.txt
#
Expand All @@ -26,7 +26,7 @@ click==8.1.3
# via
# -c hail/ci/../hail/python/dev/pinned-requirements.txt
# zulip
cryptography==40.0.1
cryptography==40.0.2
# via
# -c hail/ci/../hail/python/pinned-requirements.txt
# pyjwt
Expand All @@ -41,10 +41,6 @@ idna==3.4
# -c hail/ci/../hail/python/pinned-requirements.txt
# -c hail/ci/../web_common/pinned-requirements.txt
# requests
importlib-metadata==3.10.1
# via
# -c hail/ci/../hail/python/dev/pinned-requirements.txt
# click
matrix-client==0.4.0
# via zulip
pycparser==2.21
Expand All @@ -65,11 +61,8 @@ requests[security]==2.28.2
# zulip
typing-extensions==4.5.0
# via
# -c hail/ci/../gear/pinned-requirements.txt
# -c hail/ci/../hail/python/dev/pinned-requirements.txt
# -c hail/ci/../hail/python/pinned-requirements.txt
# -c hail/ci/../web_common/pinned-requirements.txt
# importlib-metadata
# zulip
uritemplate==4.1.1
# via
Expand All @@ -82,9 +75,5 @@ urllib3==1.26.15
# -c hail/ci/../hail/python/pinned-requirements.txt
# matrix-client
# requests
zipp==3.15.0
# via
# -c hail/ci/../hail/python/dev/pinned-requirements.txt
# importlib-metadata
zulip==0.8.2
# via -r hail/ci/requirements.txt
2 changes: 1 addition & 1 deletion dev-docs/compiler-team/development_tools.md
Expand Up @@ -51,7 +51,7 @@ https://www.anaconda.com/download/#macos
After installing Anaconda, you should create a new dev environment
for Hail with:

conda create --name hail python=3.7
conda create --name hail python=3.8

and

Expand Down
2 changes: 1 addition & 1 deletion dev-docs/development_process.md
Expand Up @@ -27,7 +27,7 @@ feature into smaller components.
Before you can write code, there are some setup steps that will allow you to
develop effectively.

Hail currently supports Python version 3.7 or greater.
Hail currently supports Python version 3.8 or greater.

```
make install-dev-requirements
Expand Down
4 changes: 2 additions & 2 deletions dev-docs/hail-for-new-engineers.md
Expand Up @@ -154,8 +154,8 @@ We use a number of technologies:

### Services Technology

We almost exclusively write services in Python 3.7. We use a number of Python packages:
- [`asyncio`](https://docs.python.org/3.7/library/asyncio.html) for concurrency which is built on
We almost exclusively write services in Python 3.8. We use a number of Python packages:
- [`asyncio`](https://docs.python.org/3.8/library/asyncio.html) for concurrency which is built on
[coroutines](https://en.wikipedia.org/wiki/Coroutine) not threads
- [`aiohttp`](https://docs.aiohttp.org/en/stable/) for serving HTTPS requests (most services speak
HTTPS)
Expand Down
2 changes: 1 addition & 1 deletion dev-docs/ksync.md
Expand Up @@ -79,7 +79,7 @@ ksync watch
3. Create a spec in ~/.ksync/ksync.yaml using the create operation

```
ksync create --local-read-only -l app=auth --name <NAMESPACE>-<APP> -n jigold $(pwd)/<APP>/ /usr/local/lib/python3.7/dist-packages/<APP>/
ksync create --local-read-only -l app=auth --name <NAMESPACE>-<APP> -n jigold $(pwd)/<APP>/ /usr/local/lib/python3.8/dist-packages/<APP>/
```

4. Use ksync get to make sure the pods are being watched
Expand Down
4 changes: 2 additions & 2 deletions docker/hail-ubuntu/Dockerfile
Expand Up @@ -20,8 +20,8 @@ RUN chmod 755 /bin/retry && \
>> /etc/apt/sources.list && \
echo 'deb-src [signed-by=/usr/share/keyrings/deadsnakes-ppa-archive-keyring.gpg] http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main' \
>> /etc/apt/sources.list && \
hail-apt-get-install python3.7-minimal python3.7-dev python3.7-distutils gcc g++ && \
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1 && \
hail-apt-get-install python3.8-minimal python3.8-dev python3.8-distutils gcc g++ && \
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1 && \
curl https://bootstrap.pypa.io/get-pip.py | python3 && \
python3 -m pip install 'pip>=21<22' && \
python3 -m pip check && \
Expand Down
2 changes: 0 additions & 2 deletions docker/hailgenetics/mirror_images.sh
Expand Up @@ -32,8 +32,6 @@ then
fi

images=(
"python-dill:3.7"
"python-dill:3.7-slim"
"python-dill:3.8"
"python-dill:3.8-slim"
"python-dill:3.9"
Expand Down
2 changes: 1 addition & 1 deletion docker/hailgenetics/python-dill/push.sh
Expand Up @@ -2,7 +2,7 @@

set -ex

for version in 3.7 3.7-slim 3.8 3.8-slim 3.9 3.9-slim 3.10 3.10-slim
for version in 3.8 3.8-slim 3.9 3.9-slim 3.10 3.10-slim
do
public=hailgenetics/python-dill:$version

Expand Down
3 changes: 0 additions & 3 deletions docker/third-party/images.txt
Expand Up @@ -7,9 +7,6 @@ grafana/grafana:9.1.4
jupyter/scipy-notebook
jupyter/scipy-notebook:c094bb7219f9
moby/buildkit:v0.8.3-rootless
python:3.7
python:3.7-slim
python:3.7-slim-stretch
python:3.8
python:3.8-slim
python:3.9
Expand Down