Skip to content

Commit 924788c

Browse files
mayeutmayeut
committed
Merge branch 'main' into pr/1575
2 parents d2abf66 + 316e049 commit 924788c

File tree

14 files changed

+78
-61
lines changed

14 files changed

+78
-61
lines changed

‎.github/workflows/update-dependencies.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v4
20-
- uses: wntrblm/nox@2024.04.15
20+
- uses: wntrblm/nox@2024.10.09
2121
with:
2222
python-versions: "3.12"
2323
- name: "Install uv"

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ script: |
102102
103103
deploy:
104104
provider: script
105+
dpl_version: 1.10.16
105106
script: COMMIT_SHA=${TRAVIS_COMMIT} ./deploy.sh
106107
on:
107108
branch: main

‎docker/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.12.7
136136

137137
FROM build_cpython AS build_cpython313
138138
COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt
139-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0rc3
139+
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0
140140

141141
FROM build_cpython AS build_cpython313_nogil
142142
COPY build_scripts/cpython-pubkey-312-313.txt /build_scripts/cpython-pubkeys.txt
143-
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0rc3 nogil
143+
RUN manylinux-entrypoint /build_scripts/build-cpython.sh 3.13.0 nogil
144144

145145

146146
FROM runtime_base

‎docker/build_scripts/install-runtime-packages.sh‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ] || [ "${AUDITWHEEL_POLICY}"
114114
fi
115115
elif [ "${BASE_POLICY}" == "musllinux" ]; then
116116
TOOLCHAIN_DEPS="binutils gcc g++ gfortran"
117-
BASETOOLS="${BASETOOLS} curl util-linux tar"
117+
BASETOOLS="${BASETOOLS} curl util-linux shadow tar"
118118
PACKAGE_MANAGER=apk
119119
apk add --no-cache ca-certificates gnupg
120120
else
@@ -146,4 +146,17 @@ if [ "${BASE_POLICY}" == "manylinux" ]; then
146146
# c.f. https://github.com/pypa/manylinux/issues/1022
147147
echo "/usr/local/lib" > /etc/ld.so.conf.d/00-manylinux.conf
148148
ldconfig
149+
else
150+
if [ ! -f /etc/pam.d/chsh ]; then
151+
cat <<EOF > /etc/pam.d/chsh
152+
#%PAM-1.0
153+
auth sufficient pam_rootok.so
154+
auth sufficient pam_shells.so
155+
account required pam_permit.so
156+
password include base-password
157+
EOF
158+
fi
159+
# set the default shell to bash
160+
chsh -s /bin/bash root
161+
useradd -D -s /bin/bash
149162
fi

‎docker/build_scripts/python_versions.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"graalpy310-graalpy240_310_native": {
2+
"graalpy311-graalpy241_311_native": {
33
"x86_64": {
4-
"version": "24.0.2",
5-
"download_url": "https://github.com/oracle/graalpython/releases/download/graal-24.0.2/graalpy-24.0.2-linux-amd64.tar.gz",
6-
"sha256": "510aa284d258e308bfa4d9df440f7739a2cf977cb9d2a0879269d9bbe485e5a4"
4+
"version": "24.1.0",
5+
"download_url": "https://github.com/oracle/graalpython/releases/download/graal-24.1.0/graalpy-24.1.0-linux-amd64.tar.gz",
6+
"sha256": "95819091eee7c21566601c22536768204b7c75e9b59e522a10961612a1dd6298"
77
},
88
"aarch64": {
9-
"version": "24.0.2",
10-
"download_url": "https://github.com/oracle/graalpython/releases/download/graal-24.0.2/graalpy-24.0.2-linux-aarch64.tar.gz",
11-
"sha256": "cd7e17bb0a72aefbd3dbc81c340b20d1ab080a7072ccfa9568658bdc6152911f"
9+
"version": "24.1.0",
10+
"download_url": "https://github.com/oracle/graalpython/releases/download/graal-24.1.0/graalpy-24.1.0-linux-aarch64.tar.gz",
11+
"sha256": "838662e07ce745708d58a50e5e030f9af608306c4595adb3a8e7ac1f6e7d8b6a"
1212
}
1313
},
1414
"pp37-pypy37_pp73": {
@@ -79,4 +79,4 @@
7979
"sha256": "e534110e1047da37c1d586c392f74de3424f871d906a2083de6d41f2a8cc9164"
8080
}
8181
}
82-
}
82+
}

‎docker/build_scripts/requirements-base-tools.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This file was autogenerated by uv via the following command:
22
# nox -s update_python_dependencies
3-
argcomplete==3.5.0 \
4-
--hash=sha256:4349400469dccfb7950bb60334a680c58d88699bff6159df61251878dc6bf74b \
5-
--hash=sha256:d4bcf3ff544f51e16e54228a7ac7f486ed70ebf2ecfe49a63a91171c76bf029b
3+
argcomplete==3.5.1 \
4+
--hash=sha256:1a1d148bdaa3e3b93454900163403df41448a248af01b6e849edc5ac08e6c363 \
5+
--hash=sha256:eb1ee355aa2557bd3d0145de7b06b2a45b0ce461e1e7813f5d066039ab4177b4
66
# via pipx
77
certifi==2024.8.30 \
88
--hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \

‎docker/build_scripts/requirements-tools/uv‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# This file was autogenerated by uv via the following command:
22
# nox -s update_python_dependencies
3-
uv==0.4.17 \
4-
--hash=sha256:01564bd760eff885ad61f44173647a569732934d1a4a558839c8088fbf75e53f \
5-
--hash=sha256:0da45ca164ef9701dcc5cac3256f1f3a4e6fabe026860101c3b14208bfbde831 \
6-
--hash=sha256:15cfd020ad4a72f17e669d070a1a8ab50f93ce899486a80029cabf87fac3a8ae \
7-
--hash=sha256:1a4098128ee54f8b4ca1b083d05f818548cf7182b5b6cbb74fd71235bd105b1d \
8-
--hash=sha256:39c862a5fae944ea89dca5bf77bf636ac26398f96179bca19e4db26121707cd0 \
9-
--hash=sha256:44360f88b8e67e36fed00976b94d3f1144faa1c5291e8f6f5306c3ded650e9bf \
10-
--hash=sha256:489f68441092827fcd590a99f91269d5fb3b5f9cca1da469f7fc3d5ef3bf3e37 \
11-
--hash=sha256:6141f08aad242372dff4b529b9d26c814e151e95d1a8c85d645a7eb11b0cb34a \
12-
--hash=sha256:7b27e69454d8f65d800bc61a3d05288cacf8e56b9b716b629b2b6977e85ceabe \
13-
--hash=sha256:87e4c3b6415e0ce6880023960d7bb7fc08acafc97a4e03c7ce8b6a49ad0c698e \
14-
--hash=sha256:8844740de53f3997175961c90ff4441e0ea7cb1d11e27b662258f8728f7623b2 \
15-
--hash=sha256:897c5d7d50341023f28b96afd0bf2553d67f3f46c12986d5ee02e517cf7d5c5a \
16-
--hash=sha256:8acb510475dd8dbce71533384b95a8b2ad204f10081c92d9d012d193bd4df884 \
17-
--hash=sha256:b3cad9f33c38a891c3adc3cedfa8171e5d1d696d03c850ecd454e16551b1308b \
18-
--hash=sha256:df5dabafa07d9beae719bf4df649cb6d825620f0bb3abf985df99fd0394dbbb6 \
19-
--hash=sha256:dfe717c980d3206d4810b5121566a1e07114b9dd470b6f9f6ebed3706c21517d \
20-
--hash=sha256:e88911392d0eef4019a1db64951eefd1081a6dda72e33ee4b5b77b32f1112a33 \
21-
--hash=sha256:f727a356e772c3cdc7752d8d9971e614670658f5219eda2449290c5c4a5c91cf
3+
uv==0.4.18 \
4+
--hash=sha256:0c4cb31594cb2ed21bd3b603a207e99dfb9610c3db44da9dbbff0f237270f582 \
5+
--hash=sha256:157e4a2c063b270de348862dd31abfe600d5601183fd2a6efe552840ac179626 \
6+
--hash=sha256:1944c0ee567ca7db60705c5d213a75b25601094b026cc17af3e704651c1e3753 \
7+
--hash=sha256:1b59d742b81c7acf75a3aac71d9b24e07407e044bebcf39d3fc3c87094014e20 \
8+
--hash=sha256:3e3ade81af961f48517fcd99318192c9c635ef9a38a7ca65026af0c803c71906 \
9+
--hash=sha256:4be600474db6733078503012f2811c4383f490f77366e66b5f686316db52c870 \
10+
--hash=sha256:4ec60141f92c9667548ebad8daf4c13aabdb58b22c21dcd834641e791e55f289 \
11+
--hash=sha256:5234d47abe339c15c318e8b1bbd136ea61c4574503eda6944a5aaea91b7f6775 \
12+
--hash=sha256:6566448278b6849846b6c586fc86748c66aa53ed70f5568e713122543cc86a50 \
13+
--hash=sha256:8250148484e1b0f89ec19467946e86ee303619985c23228b5a2f2d94d15c6d8b \
14+
--hash=sha256:8af0b60adcfa2e87c77a3008d3ed6e0b577c0535468dc58e06f905ccbd27124f \
15+
--hash=sha256:954964eff8c7e2bc63dd4beeb8d45bcaddb5149a7ef29a36abd77ec76c8b837e \
16+
--hash=sha256:96c3ccee0fd8cf0a9d679407e157b76db1a854638a4ba4fa14f4d116b4e39b03 \
17+
--hash=sha256:ade18dbbeb05c8cba4f842cc15b20e59467069183f348844750901227df5008d \
18+
--hash=sha256:b08564c8c7e8b3665ad1d6c8924d4654451f96c956eb5f3b8ec995c77734163d \
19+
--hash=sha256:df225a568da01f3d7e126d886c3694c5a4a7d8b85162a4d6e97822716ca0e7c4 \
20+
--hash=sha256:f043c3c4514c149a00a86c3bf44df43062416d41002114e60df33895e8511c41 \
21+
--hash=sha256:fcc606da545d9a5ec5c2209e7eb2a4eb76627ad75df5eb5616c0b40789fe3933
2222
# via -r .nox/update_python_dependencies/tmp/uv.in

‎docker/build_scripts/requirements3.10.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This file was autogenerated by uv via the following command:
22
# nox -s update_python_dependencies
3-
build==1.2.2 \
4-
--hash=sha256:119b2fb462adef986483438377a13b2f42064a2a3a4161f24a0cca698a07ac8c \
5-
--hash=sha256:277ccc71619d98afdd841a0e96ac9fe1593b823af481d3b0cea748e8894e0613
3+
build==1.2.2.post1 \
4+
--hash=sha256:1d61c0887fa860c01971625baae8bdd338e517b836a2f70dd1f7aa3a6b2fc5b5 \
5+
--hash=sha256:b36993e92ca9375a219c99e606a122ff365a760a2d4bba0caa09bd5278b608b7
66
# via -r requirements.in
77
importlib-metadata==8.5.0 ; python_full_version < '3.10.2' \
88
--hash=sha256:45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b \
@@ -26,9 +26,9 @@ setuptools==75.1.0 ; python_full_version < '3.13' and implementation_name != 'gr
2626
--hash=sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2 \
2727
--hash=sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538
2828
# via -r requirements.in
29-
tomli==2.0.1 ; python_full_version < '3.11' \
30-
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
31-
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
29+
tomli==2.0.2 ; python_full_version < '3.11' \
30+
--hash=sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38 \
31+
--hash=sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed
3232
# via build
3333
wheel==0.44.0 ; python_full_version < '3.13' \
3434
--hash=sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f \

‎docker/build_scripts/requirements3.11.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This file was autogenerated by uv via the following command:
22
# nox -s update_python_dependencies
3-
build==1.2.2 \
4-
--hash=sha256:119b2fb462adef986483438377a13b2f42064a2a3a4161f24a0cca698a07ac8c \
5-
--hash=sha256:277ccc71619d98afdd841a0e96ac9fe1593b823af481d3b0cea748e8894e0613
3+
build==1.2.2.post1 \
4+
--hash=sha256:1d61c0887fa860c01971625baae8bdd338e517b836a2f70dd1f7aa3a6b2fc5b5 \
5+
--hash=sha256:b36993e92ca9375a219c99e606a122ff365a760a2d4bba0caa09bd5278b608b7
66
# via -r requirements.in
77
packaging==24.1 \
88
--hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \

‎docker/build_scripts/requirements3.12.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This file was autogenerated by uv via the following command:
22
# nox -s update_python_dependencies
3-
build==1.2.2 \
4-
--hash=sha256:119b2fb462adef986483438377a13b2f42064a2a3a4161f24a0cca698a07ac8c \
5-
--hash=sha256:277ccc71619d98afdd841a0e96ac9fe1593b823af481d3b0cea748e8894e0613
3+
build==1.2.2.post1 \
4+
--hash=sha256:1d61c0887fa860c01971625baae8bdd338e517b836a2f70dd1f7aa3a6b2fc5b5 \
5+
--hash=sha256:b36993e92ca9375a219c99e606a122ff365a760a2d4bba0caa09bd5278b608b7
66
# via -r requirements.in
77
packaging==24.1 \
88
--hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \

0 commit comments

Comments
 (0)