From 570b7d5538da33d5379a4220a55cb4aa84757ad2 Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:16:35 -0500
Subject: [PATCH 1/3] Bump python from 3.12.2-alpine3.19 to 3.13.1-alpine3.20

The version of Python listed in the Pipfile is updated to match the new
Docker image tag.
---
 Dockerfile  | 4 ++--
 src/Pipfile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8dc0ad5..d234755 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Official Docker images are in the form library/<app> while non-official
 # images are in the form <user>/<app>.
-FROM docker.io/library/python:3.12.2-alpine3.19 as compile-stage
+FROM docker.io/library/python:3.13.1-alpine3.20 as compile-stage
 
 ###
 # Unprivileged user variables
@@ -53,7 +53,7 @@ RUN pipenv check --verbose \
 
 # Official Docker images are in the form library/<app> while non-official
 # images are in the form <user>/<app>.
-FROM docker.io/library/python:3.12.2-alpine3.19 as build-stage
+FROM docker.io/library/python:3.13.1-alpine3.20 as build-stage
 
 ###
 # For a list of pre-defined annotation keys and value types see:
diff --git a/src/Pipfile b/src/Pipfile
index 6480562..fdd19e6 100644
--- a/src/Pipfile
+++ b/src/Pipfile
@@ -10,4 +10,4 @@ example = {file = "https://github.com/cisagov/skeleton-python-library/archive/v0
 
 # This version should match the version of Python in the image
 [requires]
-python_full_version = "3.12.2"
+python_full_version = "3.13.1"

From b3c5df532bb8f7dac5119574ce9b50bf9e52f1e1 Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:20:40 -0500
Subject: [PATCH 2/3] Bump Python packages installed in the Dockerfile

- pip from 24.0 to 24.3.1
- pipenv from 2023.12.1 to 2024.4.0
- setuptools from 69.1.1 to 75.6.0
- wheel from 0.42.0 to 0.45.1
---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d234755..444ee90 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,10 @@ ENV CISA_HOME="/home/${CISA_USER}"
 ENV VIRTUAL_ENV="${CISA_HOME}/.venv"
 
 # Versions of the Python packages installed directly
-ENV PYTHON_PIP_VERSION=24.0
-ENV PYTHON_PIPENV_VERSION=2023.12.1
-ENV PYTHON_SETUPTOOLS_VERSION=69.1.1
-ENV PYTHON_WHEEL_VERSION=0.42.0
+ENV PYTHON_PIP_VERSION=24.3.1
+ENV PYTHON_PIPENV_VERSION=2024.4.0
+ENV PYTHON_SETUPTOOLS_VERSION=75.6.0
+ENV PYTHON_WHEEL_VERSION=0.45.1
 
 ###
 # Install the specified versions of pip, setuptools, and wheel into the system

From c09b35263a6191aea522f9c67d770f54340156c1 Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:25:00 -0500
Subject: [PATCH 3/3] Update Python virtual environment dependencies

Update the dependencies installed in the Python virtual environment by
running `pipenv lock` in the `src/` directory.
---
 src/Pipfile.lock | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/Pipfile.lock b/src/Pipfile.lock
index 6afbec3..408d508 100644
--- a/src/Pipfile.lock
+++ b/src/Pipfile.lock
@@ -1,11 +1,11 @@
 {
   "_meta": {
     "hash": {
-      "sha256": "ad65a437d348bca066601e0d05a14c0ee23e38b59d8d8e71558cb17c57259f6b"
+      "sha256": "8a376df6f25cf8583d5da89da420c5e51660f33a081c1f85236643ef31601833"
     },
     "pipfile-spec": 6,
     "requires": {
-      "python_full_version": "3.12.2"
+      "python_full_version": "3.13.1"
     },
     "sources": [
       {
@@ -16,14 +16,6 @@
     ]
   },
   "default": {
-    "contextlib2": {
-      "hashes": [
-        "sha256:3fbdb64466afd23abaf6c977627b75b6139a5a3e8ce38405c5b413aed7a0471f",
-        "sha256:ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869"
-      ],
-      "markers": "python_version >= '3.6'",
-      "version": "==21.6.0"
-    },
     "docopt": {
       "hashes": [
         "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"
@@ -35,18 +27,18 @@
     },
     "schema": {
       "hashes": [
-        "sha256:f06717112c61895cabc4707752b88716e8420a8819d71404501e114f91043197",
-        "sha256:f3ffdeeada09ec34bf40d7d79996d9f7175db93b7a5065de0faa7f41083c1e6c"
+        "sha256:5d976a5b50f36e74e2157b47097b60002bd4d42e65425fcc9c9befadb4255dde",
+        "sha256:7da553abd2958a19dc2547c388cde53398b39196175a9be59ea1caf5ab0a1807"
       ],
-      "version": "==0.7.5"
+      "version": "==0.7.7"
     },
     "setuptools": {
       "hashes": [
-        "sha256:02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56",
-        "sha256:5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8"
+        "sha256:8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6",
+        "sha256:ce74b49e8f7110f9bf04883b730f4765b774ef3ef28f722cce7c273d253aaf7d"
       ],
-      "markers": "python_version >= '3.8'",
-      "version": "==69.1.1"
+      "markers": "python_version >= '3.9'",
+      "version": "==75.6.0"
     }
   },
   "develop": {}