bump python version to 3.12 in docker

This commit is contained in:
Nick Sweeting 2024-10-04 00:45:13 -07:00
parent ed2d76af00
commit 8336c997a1
No known key found for this signature in database
4 changed files with 286 additions and 286 deletions

View file

@ -17,7 +17,7 @@
######################################################################################### #########################################################################################
# Use Debian 12 w/ faster package updates: https://packages.debian.org/bookworm-backports/ # Use Debian 12 w/ faster package updates: https://packages.debian.org/bookworm-backports/
FROM python:3.11-slim-bookworm FROM python:3.12-slim-bookworm
LABEL name="archivebox" \ LABEL name="archivebox" \
maintainer="Nick Sweeting <dockerfile@archivebox.io>" \ maintainer="Nick Sweeting <dockerfile@archivebox.io>" \
@ -59,8 +59,8 @@ ENV TZ=UTC \
npm_config_loglevel=error npm_config_loglevel=error
# Version config # Version config
ENV PYTHON_VERSION=3.11 \ ENV PYTHON_VERSION=3.12 \
NODE_VERSION=20 NODE_VERSION=22
# User config # User config
ENV ARCHIVEBOX_USER="archivebox" \ ENV ARCHIVEBOX_USER="archivebox" \

View file

@ -49,7 +49,7 @@ echo
echo "[+] Generating dev & prod requirements.txt & pdm.lock from pyproject.toml..." echo "[+] Generating dev & prod requirements.txt & pdm.lock from pyproject.toml..."
pip install --upgrade pip setuptools pip install --upgrade pip setuptools
pdm self update >/dev/null 2>&1 || true pdm self update >/dev/null 2>&1 || true
pdm venv create 3.11 pdm venv create 3.12
echo echo
echo "pyproject.toml: archivebox $(grep 'version = ' pyproject.toml | awk '{print $3}' | jq -r)" echo "pyproject.toml: archivebox $(grep 'version = ' pyproject.toml | awk '{print $3}' | jq -r)"
echo "$(which python): $(python --version | head -n 1)" echo "$(which python): $(python --version | head -n 1)"
@ -60,16 +60,16 @@ pdm info
echo echo
# https://pdm-project.org/latest/usage/lockfile/ # https://pdm-project.org/latest/usage/lockfile/
# prod # prod
pdm lock --group=':all' --production --lockfile pdm.lock --python="==3.11.*" --platform=linux pdm lock --group=':all' --production --lockfile pdm.lock --python="==3.12.*" --platform=linux
pdm lock --group=':all' --production --lockfile pdm.lock --python="==3.11.*" --platform=macos --append pdm lock --group=':all' --production --lockfile pdm.lock --python="==3.12.*" --platform=macos --append
pdm sync --group=':all' --production --lockfile pdm.lock --clean pdm sync --group=':all' --production --lockfile pdm.lock --clean
pdm export --group=':all' --production --lockfile pdm.lock --without-hashes -o requirements.txt pdm export --group=':all' --production --lockfile pdm.lock --without-hashes -o requirements.txt
# cp ./pdm.lock ./pip_dist/ # cp ./pdm.lock ./pip_dist/
# cp ./requirements.txt ./pip_dist/ # cp ./requirements.txt ./pip_dist/
# dev # dev
pdm lock --group=':all' --dev --lockfile pdm.dev.lock --python="==3.11.*" --platform=linux pdm lock --group=':all' --dev --lockfile pdm.dev.lock --python="==3.12.*" --platform=linux
pdm lock --group=':all' --dev --lockfile pdm.dev.lock --python="==3.11.*" --platform=macos --append pdm lock --group=':all' --dev --lockfile pdm.dev.lock --python="==3.12.*" --platform=macos --append
pdm sync --group=':all' --dev --lockfile pdm.dev.lock --clean pdm sync --group=':all' --dev --lockfile pdm.dev.lock --clean
pdm export --group=':all' --dev --lockfile pdm.dev.lock --without-hashes -o requirements-dev.txt pdm export --group=':all' --dev --lockfile pdm.dev.lock --without-hashes -o requirements-dev.txt
# cp ./pdm.dev.lock ./pip_dist/ # cp ./pdm.dev.lock ./pip_dist/

306
pdm.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,128 +1,128 @@
# This file is @generated by PDM. # This file is @generated by PDM.
# Please do not edit it manually. # Please do not edit it manually.
annotated-types==0.7.0; python_version == "3.11" annotated-types==0.7.0; python_version == "3.12"
anyio==4.6.0; python_version == "3.11" anyio==4.6.0; python_version == "3.12"
asgiref==3.8.1; python_version == "3.11" asgiref==3.8.1; python_version == "3.12"
asttokens==2.4.1; python_version == "3.11" asttokens==2.4.1; python_version == "3.12"
atomicwrites==1.4.1; python_version == "3.11" atomicwrites==1.4.1; python_version == "3.12"
attrs==24.2.0; python_version == "3.11" attrs==24.2.0; python_version == "3.12"
autobahn==24.4.2; python_version == "3.11" autobahn==24.4.2; python_version == "3.12"
automat==24.8.1; python_version == "3.11" automat==24.8.1; python_version == "3.12"
base32-crockford==0.3.0; python_version == "3.11" base32-crockford==0.3.0; python_version == "3.12"
beautifulsoup4==4.12.3; python_version == "3.11" beautifulsoup4==4.12.3; python_version == "3.12"
brotli==1.1.0; implementation_name == "cpython" and python_version == "3.11" brotli==1.1.0; implementation_name == "cpython" and python_version == "3.12"
brotlicffi==1.1.0.0; implementation_name != "cpython" and python_version == "3.11" brotlicffi==1.1.0.0; implementation_name != "cpython" and python_version == "3.12"
bx-django-utils==79; python_version == "3.11" bx-django-utils==79; python_version == "3.12"
bx-py-utils==104; python_version == "3.11" bx-py-utils==104; python_version == "3.12"
certifi==2024.8.30; python_version == "3.11" certifi==2024.8.30; python_version == "3.12"
cffi==1.17.1; platform_python_implementation != "PyPy" and python_version == "3.11" or implementation_name != "cpython" and python_version == "3.11" cffi==1.17.1; platform_python_implementation != "PyPy" and python_version == "3.12" or implementation_name != "cpython" and python_version == "3.12"
channels[daphne]==4.1.0; python_version == "3.11" channels[daphne]==4.1.0; python_version == "3.12"
charset-normalizer==3.3.2; python_version == "3.11" charset-normalizer==3.3.2; python_version == "3.12"
constantly==23.10.4; python_version == "3.11" constantly==23.10.4; python_version == "3.12"
croniter==3.0.3; python_version == "3.11" croniter==3.0.3; python_version == "3.12"
cryptography==43.0.1; python_version == "3.11" cryptography==43.0.1; python_version == "3.12"
daphne==4.1.2; python_version == "3.11" daphne==4.1.2; python_version == "3.12"
dateparser==1.2.0; python_version == "3.11" dateparser==1.2.0; python_version == "3.12"
decorator==5.1.1; python_version == "3.11" decorator==5.1.1; python_version == "3.12"
django==5.1.1; python_version == "3.11" django==5.1.1; python_version == "3.12"
django-admin-data-views==0.4.1; python_version == "3.11" django-admin-data-views==0.4.1; python_version == "3.12"
django-auth-ldap==4.8.0; python_version == "3.11" django-auth-ldap==4.8.0; python_version == "3.12"
django-charid-field==0.4; python_version == "3.11" django-charid-field==0.4; python_version == "3.12"
django-extensions==3.2.3; python_version == "3.11" django-extensions==3.2.3; python_version == "3.12"
django-huey==1.2.1; python_version == "3.11" django-huey==1.2.1; python_version == "3.12"
django-huey-monitor==0.9.0; python_version == "3.11" django-huey-monitor==0.9.0; python_version == "3.12"
django-jsonform==2.23.0; python_version == "3.11" django-jsonform==2.23.0; python_version == "3.12"
django-ninja==1.3.0; python_version == "3.11" django-ninja==1.3.0; python_version == "3.12"
django-object-actions==4.3.0; python_version == "3.11" django-object-actions==4.3.0; python_version == "3.12"
django-pydantic-field==0.3.10; python_version == "3.11" django-pydantic-field==0.3.10; python_version == "3.12"
django-settings-holder==0.1.2; python_version == "3.11" django-settings-holder==0.1.2; python_version == "3.12"
django-signal-webhooks==0.3.0; python_version == "3.11" django-signal-webhooks==0.3.0; python_version == "3.12"
django-stubs==5.1.0; python_version == "3.11" django-stubs==5.1.0; python_version == "3.12"
django-stubs-ext==5.1.0; python_version == "3.11" django-stubs-ext==5.1.0; python_version == "3.12"
django-taggit==1.3.0; python_version == "3.11" django-taggit==1.3.0; python_version == "3.12"
et-xmlfile==1.1.0; python_version == "3.11" et-xmlfile==1.1.0; python_version == "3.12"
executing==2.1.0; python_version == "3.11" executing==2.1.0; python_version == "3.12"
feedparser==6.0.11; python_version == "3.11" feedparser==6.0.11; python_version == "3.12"
ftfy==6.2.3; python_version == "3.11" ftfy==6.2.3; python_version == "3.12"
h11==0.14.0; python_version == "3.11" h11==0.14.0; python_version == "3.12"
httpcore==1.0.6; python_version == "3.11" httpcore==1.0.6; python_version == "3.12"
httpx==0.27.2; python_version == "3.11" httpx==0.27.2; python_version == "3.12"
huey==2.5.2; python_version == "3.11" huey==2.5.2; python_version == "3.12"
hyperlink==21.0.0; python_version == "3.11" hyperlink==21.0.0; python_version == "3.12"
idna==3.10; python_version == "3.11" idna==3.10; python_version == "3.12"
incremental==24.7.2; python_version == "3.11" incremental==24.7.2; python_version == "3.12"
ipython==8.28.0; python_version == "3.11" ipython==8.28.0; python_version == "3.12"
jedi==0.19.1; python_version == "3.11" jedi==0.19.1; python_version == "3.12"
mailchecker==6.0.11; python_version == "3.11" mailchecker==6.0.11; python_version == "3.12"
markdown-it-py==3.0.0; python_version == "3.11" markdown-it-py==3.0.0; python_version == "3.12"
matplotlib-inline==0.1.7; python_version == "3.11" matplotlib-inline==0.1.7; python_version == "3.12"
mdurl==0.1.2; python_version == "3.11" mdurl==0.1.2; python_version == "3.12"
mutagen==1.47.0; python_version == "3.11" mutagen==1.47.0; python_version == "3.12"
mypy-extensions==1.0.0; python_version == "3.11" mypy-extensions==1.0.0; python_version == "3.12"
openpyxl==3.1.5; python_version == "3.11" openpyxl==3.1.5; python_version == "3.12"
parso==0.8.4; python_version == "3.11" parso==0.8.4; python_version == "3.12"
pexpect==4.9.0; (sys_platform != "win32" and sys_platform != "emscripten") and python_version == "3.11" pexpect==4.9.0; (sys_platform != "win32" and sys_platform != "emscripten") and python_version == "3.12"
phonenumbers==8.13.46; python_version == "3.11" phonenumbers==8.13.47; python_version == "3.12"
pluggy==1.5.0; python_version == "3.11" pluggy==1.5.0; python_version == "3.12"
pocket @ git+https://github.com/tapanpandita/pocket.git@5a144438cc89bfc0ec94db960718ccf1f76468c1 ; python_version == "3.11" pocket @ git+https://github.com/tapanpandita/pocket.git@5a144438cc89bfc0ec94db960718ccf1f76468c1 ; python_version == "3.12"
prompt-toolkit==3.0.48; python_version == "3.11" prompt-toolkit==3.0.48; python_version == "3.12"
psutil==6.0.0; python_version == "3.11" psutil==6.0.0; python_version == "3.12"
ptyprocess==0.7.0; (sys_platform != "win32" and sys_platform != "emscripten") and python_version == "3.11" ptyprocess==0.7.0; (sys_platform != "win32" and sys_platform != "emscripten") and python_version == "3.12"
pure-eval==0.2.3; python_version == "3.11" pure-eval==0.2.3; python_version == "3.12"
py-machineid==0.6.0; python_version == "3.11" py-machineid==0.6.0; python_version == "3.12"
pyasn1==0.6.1; python_version == "3.11" pyasn1==0.6.1; python_version == "3.12"
pyasn1-modules==0.4.1; python_version == "3.11" pyasn1-modules==0.4.1; python_version == "3.12"
pycparser==2.22; platform_python_implementation != "PyPy" and python_version == "3.11" or implementation_name != "cpython" and python_version == "3.11" pycparser==2.22; platform_python_implementation != "PyPy" and python_version == "3.12" or implementation_name != "cpython" and python_version == "3.12"
pycryptodomex==3.21.0; python_version == "3.11" pycryptodomex==3.21.0; python_version == "3.12"
pydantic==2.9.2; python_version == "3.11" pydantic==2.9.2; python_version == "3.12"
pydantic-core==2.23.4; python_version == "3.11" pydantic-core==2.23.4; python_version == "3.12"
pydantic-pkgr==0.3.9; python_version == "3.11" pydantic-pkgr==0.3.9; python_version == "3.12"
pydantic-settings==2.5.2; python_version == "3.11" pydantic-settings==2.5.2; python_version == "3.12"
pygments==2.18.0; python_version == "3.11" pygments==2.18.0; python_version == "3.12"
pyopenssl==24.2.1; python_version == "3.11" pyopenssl==24.2.1; python_version == "3.12"
python-benedict[html,toml,xls,xml,yaml]==0.33.2; python_version == "3.11" python-benedict[html,toml,xls,xml,yaml]==0.33.2; python_version == "3.12"
python-benedict[io,parse]==0.33.2; python_version == "3.11" python-benedict[io,parse]==0.33.2; python_version == "3.12"
python-benedict[xml]==0.33.2; python_version == "3.11" python-benedict[xml]==0.33.2; python_version == "3.12"
python-crontab==3.2.0; python_version == "3.11" python-crontab==3.2.0; python_version == "3.12"
python-dateutil==2.9.0.post0; python_version == "3.11" python-dateutil==2.9.0.post0; python_version == "3.12"
python-dotenv==1.0.1; python_version == "3.11" python-dotenv==1.0.1; python_version == "3.12"
python-fsutil==0.14.1; python_version == "3.11" python-fsutil==0.14.1; python_version == "3.12"
python-ldap==3.4.4; python_version == "3.11" python-ldap==3.4.4; python_version == "3.12"
python-slugify==8.0.4; python_version == "3.11" python-slugify==8.0.4; python_version == "3.12"
python-stdnum==1.20; python_version == "3.11" python-stdnum==1.20; python_version == "3.12"
pytz==2024.2; python_version == "3.11" pytz==2024.2; python_version == "3.12"
pyyaml==6.0.2; python_version == "3.11" pyyaml==6.0.2; python_version == "3.12"
regex==2024.9.11; python_version == "3.11" regex==2024.9.11; python_version == "3.12"
requests==2.32.3; python_version == "3.11" requests==2.32.3; python_version == "3.12"
rich==13.9.1; python_version == "3.11" rich==13.9.1; python_version == "3.12"
rich-argparse==1.5.2; python_version == "3.11" rich-argparse==1.5.2; python_version == "3.12"
service-identity==24.1.0; python_version == "3.11" service-identity==24.1.0; python_version == "3.12"
setuptools==75.1.0; python_version == "3.11" setuptools==75.1.0; python_version == "3.12"
sgmllib3k==1.0.0; python_version == "3.11" sgmllib3k==1.0.0; python_version == "3.12"
six==1.16.0; python_version == "3.11" six==1.16.0; python_version == "3.12"
sniffio==1.3.1; python_version == "3.11" sniffio==1.3.1; python_version == "3.12"
sonic-client==1.0.0; python_version == "3.11" sonic-client==1.0.0; python_version == "3.12"
soupsieve==2.6; python_version == "3.11" soupsieve==2.6; python_version == "3.12"
sqlparse==0.5.1; python_version == "3.11" sqlparse==0.5.1; python_version == "3.12"
stack-data==0.6.3; python_version == "3.11" stack-data==0.6.3; python_version == "3.12"
supervisor==4.2.5; python_version == "3.11" supervisor==4.2.5; python_version == "3.12"
text-unidecode==1.3; python_version == "3.11" text-unidecode==1.3; python_version == "3.12"
toml==0.10.2; python_version == "3.11" toml==0.10.2; python_version == "3.12"
traitlets==5.14.3; python_version == "3.11" traitlets==5.14.3; python_version == "3.12"
twisted[tls]==24.7.0; python_version == "3.11" twisted[tls]==24.7.0; python_version == "3.12"
txaio==23.1.1; python_version == "3.11" txaio==23.1.1; python_version == "3.12"
typeid-python==0.3.1; python_version == "3.11" typeid-python==0.3.1; python_version == "3.12"
types-pyyaml==6.0.12.20240917; python_version == "3.11" types-pyyaml==6.0.12.20240917; python_version == "3.12"
typing-extensions==4.12.2; python_version == "3.11" typing-extensions==4.12.2; python_version == "3.12"
tzlocal==5.2; python_version == "3.11" tzlocal==5.2; python_version == "3.12"
ulid-py==1.1.0; python_version == "3.11" ulid-py==1.1.0; python_version == "3.12"
urllib3==2.2.3; python_version == "3.11" urllib3==2.2.3; python_version == "3.12"
uuid6==2024.7.10; python_version == "3.11" uuid6==2024.7.10; python_version == "3.12"
w3lib==2.2.1; python_version == "3.11" w3lib==2.2.1; python_version == "3.12"
wcwidth==0.2.13; python_version == "3.11" wcwidth==0.2.13; python_version == "3.12"
websockets==13.1; python_version == "3.11" websockets==13.1; python_version == "3.12"
xlrd==2.0.1; python_version == "3.11" xlrd==2.0.1; python_version == "3.12"
xmltodict==0.13.0; python_version == "3.11" xmltodict==0.13.0; python_version == "3.12"
yt-dlp==2024.9.27; python_version == "3.11" yt-dlp==2024.9.27; python_version == "3.12"
zope-interface==7.0.3; python_version == "3.11" zope-interface==7.0.3; python_version == "3.12"