From 822646469d53b908f7a95a5be6ca37905c41b06f Mon Sep 17 00:00:00 2001 From: s-hertel <19572925+s-hertel@users.noreply.github.com> Date: Mon, 15 May 2023 14:17:45 -0400 Subject: [PATCH 1/6] Add Python 3.12 to the base-test-container using the deadsnakes nightly repo --- Dockerfile | 5 ++++- files/deadsnakes.list | 3 +++ files/installer.py | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d0a78a..b44517a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/* @@ -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 RUN /usr/share/container-setup/python -B /usr/share/container-setup/setup.py # Make sure the pip entry points in /usr/bin are correct. diff --git a/files/deadsnakes.list b/files/deadsnakes.list index 4688b06..9bc5777 100644 --- a/files/deadsnakes.list +++ b/files/deadsnakes.list @@ -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 diff --git a/files/installer.py b/files/installer.py index b66a9f2..f73e4af 100644 --- a/files/installer.py +++ b/files/installer.py @@ -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', ) From e57c2beef3653d7c61f115236888de2899f0df98 Mon Sep 17 00:00:00 2001 From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com> Date: Wed, 17 May 2023 11:23:23 -0400 Subject: [PATCH 2/6] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b44517a..39dfc25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -91,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.12 /usr/share/container-setup/python +RUN ln -s /usr/bin/python3.11 /usr/share/container-setup/python RUN /usr/share/container-setup/python -B /usr/share/container-setup/setup.py # Make sure the pip entry points in /usr/bin are correct. From 51852dd9157007ca40e2d7c8560ee66c7e871864 Mon Sep 17 00:00:00 2001 From: s-hertel <19572925+s-hertel@users.noreply.github.com> Date: Wed, 17 May 2023 15:41:47 -0400 Subject: [PATCH 3/6] Revert "Update Dockerfile" This reverts commit e57c2beef3653d7c61f115236888de2899f0df98. Handled in ansible-test by adding max python version for docs build test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 39dfc25..b44517a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -91,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 RUN /usr/share/container-setup/python -B /usr/share/container-setup/setup.py # Make sure the pip entry points in /usr/bin are correct. From 8a4d566169f0c1ac5479976eeec829fd65d7cf7e Mon Sep 17 00:00:00 2001 From: s-hertel <19572925+s-hertel@users.noreply.github.com> Date: Thu, 18 May 2023 17:27:15 -0400 Subject: [PATCH 4/6] Drop Python 3.5 --- Dockerfile | 2 -- files/installer.py | 5 ----- files/quiet_pip.py | 4 ---- 3 files changed, 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index b44517a..114ed48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,8 +40,6 @@ COPY files/deadsnakes.list /etc/apt/sources.list.d/deadsnakes.list # This is done separately to avoid conflicts with official Ubuntu packages. RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - python3.5-dev \ - python3.5-venv \ python3.6-dev \ python3.6-venv \ python3.7-dev \ diff --git a/files/installer.py b/files/installer.py index f73e4af..ba740ad 100644 --- a/files/installer.py +++ b/files/installer.py @@ -64,11 +64,6 @@ class Pip: setuptools='44.1.1', # 45.0.0 requires Python 3.5+ wheel=None, ), - '3.5': dict( - pip='20.3.4', # 21.0 requires Python 3.6+ - setuptools='50.3.2', # 51.0.0 requires Python 3.6+ - wheel=None, - ), '3.6': dict( pip='21.3.1', # 22.0 requires Python 3.7+ setuptools='59.6.0', # 59.7.0 requires Python 3.7+ diff --git a/files/quiet_pip.py b/files/quiet_pip.py index 4dac1a4..891afd3 100644 --- a/files/quiet_pip.py +++ b/files/quiet_pip.py @@ -27,10 +27,6 @@ # pip 21.0 will drop support for Python 2.7 in January 2021. # More details about Python 2 support in pip, can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support 'DEPRECATION: Python 2.7 reached the end of its life ', - - # DEPRECATION: Python 3.5 reached the end of its life on September 13th, 2020. Please upgrade your Python as Python 3.5 is no longer maintained. - # pip 21.0 will drop support for Python 3.5 in January 2021. pip 21.0 will remove support for this functionality. - 'DEPRECATION: Python 3.5 reached the end of its life ', ) From 3d2051676add5a01679ebcc0c1152b9197db5496 Mon Sep 17 00:00:00 2001 From: s-hertel <19572925+s-hertel@users.noreply.github.com> Date: Wed, 14 Jun 2023 01:16:31 +0000 Subject: [PATCH 5/6] wait for Python 3.12 until ansible-test supports it --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 114ed48..cb74ae9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -89,7 +89,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.12 /usr/share/container-setup/python +RUN ln -s /usr/bin/python3.11 /usr/share/container-setup/python RUN /usr/share/container-setup/python -B /usr/share/container-setup/setup.py # Make sure the pip entry points in /usr/bin are correct. From 3f72bfdf51b08832bc6e229e4fa3c42a6f1795fa Mon Sep 17 00:00:00 2001 From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com> Date: Wed, 14 Jun 2023 18:38:06 -0400 Subject: [PATCH 6/6] Update files/deadsnakes.list --- files/deadsnakes.list | 3 --- 1 file changed, 3 deletions(-) diff --git a/files/deadsnakes.list b/files/deadsnakes.list index 9bc5777..4688b06 100644 --- a/files/deadsnakes.list +++ b/files/deadsnakes.list @@ -1,5 +1,2 @@ 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