add python 3.12 (#42)

--------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Borda · Jul 8, 2024 · f7f053a · f7f053a
1 parent 03f0b80
commit f7f053a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml
@@ -21,11 +21,33 @@ jobs:
         python_version: ["2.7", "3.6", "3.7", "3.8", "3.9"]
         opencv_version: ["4.10.0"]
         device: ["cpu", "gpu"]
+        cuda_version: ["11.8.0"]
         include:
           - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "cpu" }
-          - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "gpu" }
           - { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "cpu" }
-          - { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "gpu" }
+          # fixme: python 3.12 install fails due to wring public keys to deadsnakes
+          # - { ubuntu_version: "22.04", python_version: "3.12", opencv_version: "4.10.0", device: "cpu" }
+          - {
+              ubuntu_version: "22.04",
+              python_version: "3.10",
+              opencv_version: "4.10.0",
+              device: "gpu",
+              cuda_version: "12.5.0",
+            }
+          - {
+              ubuntu_version: "22.04",
+              python_version: "3.11",
+              opencv_version: "4.10.0",
+              device: "gpu",
+              cuda_version: "12.5.0",
+            }
+          - {
+              ubuntu_version: "22.04",
+              python_version: "3.12",
+              opencv_version: "4.10.0",
+              device: "gpu",
+              cuda_version: "12.5.0",
+            }
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -45,6 +67,7 @@ jobs:
             UBUNTU_VERSION=${{ matrix.ubuntu_version }}
             PYTHON_VERSION=${{ matrix.python_version }}
             OPENCV_VERSION=${{ matrix.opencv_version }}
+            CUDA_VERSION=${{ matrix.cuda_version }}
           file: ${{ matrix.device }}/Dockerfile
           # publish master
           push: ${{ github.ref == 'refs/heads/master' }}

diff --git a/cpu/Dockerfile b/cpu/Dockerfile
@@ -21,7 +21,7 @@ RUN \
     # add sources for older pythons
     apt-get update -q --fix-missing && \
     apt-get install -y --no-install-recommends software-properties-common && \
-    if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7)$ ]]; then \
+    if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7|3.12)$ ]]; then \
         add-apt-repository ppa:deadsnakes/ppa ; \
     fi && \
     apt-add-repository universe && \

diff --git a/gpu/Dockerfile b/gpu/Dockerfile
@@ -27,7 +27,7 @@ RUN \
     # add sources for older pythons
     apt-get update -qq --fix-missing && \
     apt-get install -y --no-install-recommends software-properties-common && \
-    if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7)$ ]]; then \
+    if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7|3.12)$ ]]; then \
         add-apt-repository ppa:deadsnakes/ppa ; \
     fi && \
     apt-add-repository universe && \