Update Dependencies and use Python 3.12 (#25)

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
       - published
 
 env:
-  PYTHON_VERSION: '3.11'
+  PYTHON_VERSION: '3.12'
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}
@@ -48,7 +48,6 @@ jobs:
         run: |
           poetry install
           poetry run make -C dist clean
-          poetry run make -C dist all
       - name: Run pytest
         run: poetry run pytest
 

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
     hooks:
       - id: pyupgrade
         language: python
-        args: [--py311-plus]
+        args: [--py312-plus]
   - repo: https://github.com/pycqa/isort
     rev: 5.13.2
     hooks:

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11
+FROM python:3.12
 
 RUN mkdir -p /opt/src/dist
 

README.md

@@ -13,7 +13,7 @@ The application contains:
 - A `fastapi` web server that implements the SageMaker endpoints
 - and `pydantic` models that interface between S3, and run the original inference jobs.
 
-The application is compiled on Python 3.11 using `pyinstaller`, and then distributed as a statically linked binary using `staticx`.
+The application is compiled on Python 3.12 using `pyinstaller`, and then distributed as a statically linked binary using `staticx`.
 It is able to adapt any container, including ones based on `scratch` or `alpine` images.
 
 ## Usage

dist/Makefile

@@ -13,8 +13,8 @@ sagemaker-shim-static-${TEST_VERSION}: sagemaker-shim-${TEST_VERSION}
 	staticx "sagemaker-shim-${TEST_VERSION}" "sagemaker-shim-static-${TEST_VERSION}"
 
 crane-src.tar.gz:
-	curl -L https://github.com/google/go-containerregistry/releases/download/v0.17.0/go-containerregistry_Linux_x86_64.tar.gz -o crane-src.tar.gz && \
-	echo "1b4d3ee1e214776bd74b88741ccf1b070e8ed5660056f05af632a1a399fe21c6  crane-src.tar.gz" | shasum -c - || exit 1
+	curl -L https://github.com/google/go-containerregistry/releases/download/v0.19.2/go-containerregistry_Linux_x86_64.tar.gz -o crane-src.tar.gz && \
+	echo "8e5a27413b3fa3b95467c8d36dfb55f7109075872a05fcc0dd674f537439513d  crane-src.tar.gz" | shasum -c - || exit 1
 
 crane: crane-src.tar.gz
 	tar -xzvf crane-src.tar.gz crane && \

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sagemaker-shim"
-version = "0.3.0a2"
+version = "0.3.0"
 description = "Adapts algorithms that implement the Grand Challenge inference API for running in SageMaker"
 authors = ["James Meakin <[email protected]>"]
 license = "Apache-2.0"
@@ -16,8 +16,8 @@ sagemaker-shim = "sagemaker_shim.cli:cli"
 
 [tool.poetry.dependencies]
 # Only support one version of python at a time
-python = "^3.11,<3.12"
-fastapi = "!=0.89.0"
+python = "^3.12,<3.13"
+fastapi = "!=0.89.0,<0.111.0"  # See https://github.com/DIAGNijmegen/rse-sagemaker-shim/issues/26
 uvicorn = "*"
 click = "*"
 boto3 = "*"
@@ -48,7 +48,7 @@ line_length = 79
 
 [tool.black]
 line-length = 79
-target-version = ['py311']
+target-version = ['py312']
 
 [tool.pytest.ini_options]
 markers = [

setup.cfg

@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.11
+python_version = 3.12
 plugins = pydantic.mypy
 strict = True
 

tests/test_container_image.py

@@ -35,7 +35,7 @@ def _container_helper(request) -> None:
 def _container(*, base_image="ubuntu:latest", host_port=8080, cmd=None):
     client = docker.from_env()
     registry = client.containers.run(
-        image="registry:2.7",
+        image="registry:2",
         ports={5000: None},
         auto_remove=True,
         detach=True,
@@ -181,7 +181,7 @@ def test_alpine_image(minio):
     # https://github.com/JonathonReinhart/staticx/issues/143
     host_port = 8081
     with _container(
-        base_image="python:3.11-alpine",
+        base_image="python:3.12-alpine",
         host_port=host_port,
         cmd=["python", "-c", "print('hello_world')"],
     ):

tests/test_patch_image.py

@@ -25,7 +25,7 @@ def _registry_helper(request) -> None:
 def registry():
     client = docker.from_env()
     registry = client.containers.run(
-        image="registry:2.7",
+        image="registry:2",
         ports={5000: None},
         auto_remove=True,
         detach=True,
@@ -76,7 +76,6 @@ def test_patch_image(registry):
     assert new_config["config"]["Entrypoint"] == ["/sagemaker-shim"]
     assert "Cmd" not in new_config["config"]
     assert set(new_config["config"]["Env"]) == {
-        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
         "GRAND_CHALLENGE_COMPONENT_CMD_B64J=WyJzaCJd",
         "GRAND_CHALLENGE_COMPONENT_ENTRYPOINT_B64J=bnVsbA==",
         "GRAND_CHALLENGE_COMPONENT_USER=0:0",