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.

Sign up for GitHub

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

Jump to bottom

Python 3.12 #195

Merged
merged 6 commits into from
Oct 3, 2023
Merged

Python 3.12 #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d85a009
Use 3.12.0 over 3.12.0rc2 for 3.12 support
ChrisLovering Oct 2, 2023
a218ccc
Use 3.12.0 by default
ChrisLovering Oct 2, 2023
32bb655
Replace 3.11 support with 3.13-dev
ChrisLovering Oct 2, 2023
b5c7884
Update eval-deps markers for new Python versions
ChrisLovering Oct 2, 2023
3da229c
Bump all eval-deps to latest versions
ChrisLovering Oct 2, 2023
08f89a0
Remove toml eval-dep as the stdlib now supports it
ChrisLovering Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,14 @@ RUN apt-get -y update \

COPY --link scripts/build_python.sh /

# ------------------------------------------------------------------------------
FROM builder-py-base as builder-py-3_11
RUN git clone -b v2.3.26 --depth 1 https://github.com/pyenv/pyenv.git $PYENV_ROOT \
&& /build_python.sh 3.11.5

# ------------------------------------------------------------------------------
FROM builder-py-base as builder-py-3_12
RUN git clone -b v2.3.26 --depth 1 https://github.com/pyenv/pyenv.git $PYENV_ROOT \
&& /build_python.sh 3.12.0rc2

RUN git clone -b v2.3.28 --depth 1 https://github.com/pyenv/pyenv.git $PYENV_ROOT \
&& /build_python.sh 3.12.0
# ------------------------------------------------------------------------------
FROM builder-py-base as builder-py-3_13
RUN git clone -b v2.3.28 --depth 1 https://github.com/pyenv/pyenv.git $PYENV_ROOT \
&& /build_python.sh 3.13-dev
# ------------------------------------------------------------------------------
FROM python:3.11-slim-bookworm as base

Expand All @@ -56,11 +54,11 @@ RUN apt-get -y update \
&& rm -rf /var/lib/apt/lists/*

COPY --link --from=builder-nsjail /nsjail/nsjail /usr/sbin/
COPY --link --from=builder-py-3_11 /lang/ /lang/
COPY --link --from=builder-py-3_12 /lang/ /lang/
COPY --link --from=builder-py-3_13 /lang/ /lang/

RUN chmod +x /usr/sbin/nsjail \
&& ln -s /lang/python/3.11/ /lang/python/default
&& ln -s /lang/python/3.12/ /lang/python/default

# ------------------------------------------------------------------------------
FROM base as venv
Expand Down
22 changes: 10 additions & 12 deletions requirements/eval-deps.pip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
anyio[trio]~=3.7
arrow~=1.2
anyio[trio]~=4.0
arrow~=1.3
attrs~=23.1
beautifulsoup4~=4.12
einspect~=0.5
einspect~=0.5 ; python_version == '3.12'
fishhook~=0.2
forbiddenfruit~=0.1
fuzzywuzzy~=0.18
lark~=1.1
matplotlib~=3.7 ; python_version == '3.11' # https://github.com/matplotlib/matplotlib/pull/26582
matplotlib~=3.8 ; python_version == '3.12'
more-itertools~=10.1
networkx~=3.1
numpy~=1.25 ; python_version == '3.11'
numpy==1.26.0rc1 ; python_version == '3.12'
pandas~=2.0 ; python_version == '3.11'
pendulum~=2.1 ; python_version == '3.11' # https://github.com/sdispater/pendulum/issues/696
numpy~=1.26 ; python_version == '3.12'
pandas~=2.1 ; python_version == '3.12'
# pendulum~=2.1 # Doesn't support 3.12, see https://github.com/sdispater/pendulum/issues/696
python-dateutil~=2.8
pyyaml~=6.0
scipy~=1.11
scipy~=1.11 ; python_version == '3.12'
sympy~=1.12
toml~=0.10
typing-extensions~=4.7
typing-extensions~=4.8
tzdata~=2023.3
yarl~=1.9 ; python_version == '3.11' # https://github.com/aio-libs/yarl/issues/894
#yarl~=1.9 # Doesn't support 3.12, see https://github.com/aio-libs/yarl/issues/894
Loading