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

Add Python 3.12 and remove Python 3.5 #26

Merged
merged 6 commits into from
Jun 14, 2023
Merged

Add Python 3.12 and remove Python 3.5 #26

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8226464
Add Python 3.12 to the base-test-container using the deadsnakes night…
s-hertel May 15, 2023
e57c2be
Update Dockerfile
s-hertel May 17, 2023
51852dd
Revert "Update Dockerfile"
s-hertel May 17, 2023
8a4d566
Drop Python 3.5
s-hertel May 18, 2023
3d20516
wait for Python 3.12 until ansible-test supports it
s-hertel Jun 14, 2023
3f72bfd
Update files/deadsnakes.list
s-hertel Jun 14, 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
5 changes: 4 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ RUN apt-get update -y && \
python3.11-dev \
python3.11-distutils \
python3.11-venv \
python3.12-dev \
python3.12-distutils \
python3.12-venv \
&& \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
Expand Down Expand Up @@ -88,7 +91,7 @@ CMD ["/sbin/init"]

# Install pip last to speed up local container rebuilds.
COPY files/*.py /usr/share/container-setup/
RUN ln -s /usr/bin/python3.11 /usr/share/container-setup/python
RUN ln -s /usr/bin/python3.12 /usr/share/container-setup/python
s-hertel marked this conversation as resolved.
Show resolved Hide resolved
RUN /usr/share/container-setup/python -B /usr/share/container-setup/setup.py

# Make sure the pip entry points in /usr/bin are correct.
Expand Down
3 changes: 3 additions & 0 deletions files/deadsnakes.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
deb [signed-by=/etc/apt/keyrings/deadsnakes.gpg] http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main
deb-src [signed-by=/etc/apt/keyrings/deadsnakes.gpg] http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main

deb [signed-by=/etc/apt/keyrings/deadsnakes.gpg] http://ppa.launchpad.net/deadsnakes/nightly/ubuntu focal main
deb-src [signed-by=/etc/apt/keyrings/deadsnakes.gpg] http://ppa.launchpad.net/deadsnakes/nightly/ubuntu focal main
s-hertel marked this conversation as resolved.
Show resolved Hide resolved
s-hertel marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions files/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ class Pip:
)

_DEFAULT_PACKAGES = dict(
pip='21.3.1',
setuptools='60.8.2',
pip='23.1.2',
setuptools='67.7.2',
wheel='0.37.1',
)

Expand Down