Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixup! [u] Update to Python 3.12.x (#5736)
Browse files Browse the repository at this point in the history
dsotirho-ucsc committed Nov 13, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 2054e69 commit d4778c9
Showing 6 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1032,7 +1032,7 @@ found in [`AzulTestCase`](test/azul_test_case.py) and commit the modifications.
## Setting up the Azul build prerequisites on macOS 12 (Monterey)
The steps below are examplary for Python 3.12.6. Replace `3.12.6` with the value
The steps below are examplary for Python 3.12.7. Replace `3.12.7` with the value
of `azul_python_version` in [environment.py](environment.py).
Make `bash` the default shell. Google it.
@@ -1048,10 +1048,10 @@ brew install zlib pyenv
Install python
```
pyenv install 3.12.6
pyenv install 3.12.7
```
Set `PYENV_VERSION` to `3.12.6` in `environment.local.py` at the project root.
Set `PYENV_VERSION` to `3.12.7` in `environment.local.py` at the project root.
Do not set `SYSTEM_VERSION_COMPAT`. For a more maintainable configuration use
`os.environ['azul_python_version']` as the value and `import os` at the top.
@@ -2319,7 +2319,7 @@ If you add a dependency on a package with native code, you need to build the
wheel manually:

```
(.venv) ~/workspace/hca/azul$ docker run -it -v ${project_root}/:/root/azul python:3.12.6-slim-bookworm bash
(.venv) ~/workspace/hca/azul$ docker run -it -v ${project_root}/:/root/azul python:3.12.7-slim-bookworm bash
root@97804cb60d95:/# pip --version
pip 24.2 from /usr/local/lib/python3.12/site-packages/pip (python 3.12)
2 changes: 1 addition & 1 deletion UPGRADING.rst
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ have too many entries in this file.
#5736 Update to Python 3.12.x
=============================

Update Python on your developer machines to version 3.12.6. In your working
Update Python on your developer machines to version 3.12.7. In your working
copy, run ``make virtualenv`` and ``make requirements envhook``.


14 changes: 7 additions & 7 deletions docker_images.json
Original file line number Diff line number Diff line change
@@ -15,18 +15,18 @@
}
}
},
"docker.io/library/python:3.12.6-slim-bookworm": {
"digest": "sha256:15bad989b293be1dd5eb26a87ecacadaee1559f98e29f02bf6d00c8d86129f39",
"mirror_digest": "sha256:289f8a62caa961ebb045882e86adf8870a802f322c962078c2532858c3090756",
"docker.io/library/python:3.12.7-slim-bookworm": {
"digest": "sha256:2a6386ad2db20e7f55073f69a98d6da2cf9f168e05e7487d2670baeb9b7601c5",
"mirror_digest": "sha256:e0a42aac29c848373dadeb69551ffa6ab97a9aceba49b415bafc8c117e9dd074",
"parts": {
"linux/amd64": {
"digest": "sha256:e0203bb78451dc5e8fe447983dc664f454068e8eea8d47b204cbe80a99b09d3e",
"id": "sha256:0d8d642b665d136b7a11d9f4a3d8a25b18deba7479b5897009fdee7e3fe1eb0e",
"digest": "sha256:c013e32e74b0ed13ac59533a446bcfcc962a877ea534ef305d455624dd71b1ac",
"id": "sha256:668757ec60efb72ddf3c03bc8d452cc79173fcc6a04c5b5d5f8b470ff1370973",
"platform": "linux/amd64"
},
"linux/arm64": {
"digest": "sha256:c0c2008864355f2263dcc690b1190540315bdd179dfbb0fae6ee58b174da4041",
"id": "sha256:c0cb1ac1ea30eef3bedf58895ed0abf74baac5411ea0ed177645ff5a1c0a00c8",
"digest": "sha256:d21d7b3b7dbd985e7e71b42435d5218c2a4b211e4fca66f3a9b66f2c7624fcec",
"id": "sha256:e359a8be29f6b9052628a435cb590f905d643431f96f7c1decce226155cc6d3b",
"platform": "linux/arm64"
}
}
4 changes: 2 additions & 2 deletions environment.boot
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
azul_python_version=3.12.6
azul_python_image=docker.io/library/python@sha256:289f8a62caa961ebb045882e86adf8870a802f322c962078c2532858c3090756
azul_python_version=3.12.7
azul_python_image=docker.io/library/python@sha256:e0a42aac29c848373dadeb69551ffa6ab97a9aceba49b415bafc8c117e9dd074
azul_docker_version=27.3.1
azul_terraform_version=1.9.8
2 changes: 1 addition & 1 deletion environment.py
Original file line number Diff line number Diff line change
@@ -248,7 +248,7 @@ def env() -> Mapping[str, Optional[str]]:
# and committing the resulting changes. It also requires redeploying the
# `shared` component.
#
'azul_python_version': '3.12.6',
'azul_python_version': '3.12.7',

# The version of Terraform used throughout the system.
#
4 changes: 2 additions & 2 deletions test/test_log_forwarding.py
Original file line number Diff line number Diff line change
@@ -153,7 +153,7 @@ def test_s3(self):
'85',
'52',
dq('-'),
dq('Boto3/1.24.94 Python/3.12.6 Linux/4.14.255-301-238.520.amzn2.x86_64',
dq('Boto3/1.24.94 Python/3.12.7 Linux/4.14.255-301-238.520.amzn2.x86_64',
'exec-env/AWS_Lambda_python3.12 aws-chalice/1.30.0 Botocore/1.27.94'),
'-',
'jcmyLMRqqJ7dT4ovtY21rtgwmuTC3qs24vgAtLAkcad9sRV92zC90gf2zGvCkxxsLSaKm48AMjo=',
@@ -193,7 +193,7 @@ def test_s3(self):
'tls_version': 'TLSv1.2',
'total_time': '85',
'turn_around_time': '52',
'user_agent': 'Boto3/1.24.94 Python/3.12.6 Linux/4.14.255-301-238.520.amzn2.x86_64 '
'user_agent': 'Boto3/1.24.94 Python/3.12.7 Linux/4.14.255-301-238.520.amzn2.x86_64 '
'exec-env/AWS_Lambda_python3.12 aws-chalice/1.30.0 Botocore/1.27.94',
'version_id': '-',
}]

0 comments on commit d4778c9

Please sign in to comment.