Skip to content

Commit f7f053a

Browse files
add python 3.12 (#42)
--------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 03f0b80 commit f7f053a

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed

.github/workflows/docker-builds.yml

+25-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,33 @@ jobs:
2121
python_version: ["2.7", "3.6", "3.7", "3.8", "3.9"]
2222
opencv_version: ["4.10.0"]
2323
device: ["cpu", "gpu"]
24+
cuda_version: ["11.8.0"]
2425
include:
2526
- { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "cpu" }
26-
- { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "gpu" }
2727
- { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "cpu" }
28-
- { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "gpu" }
28+
# fixme: python 3.12 install fails due to wring public keys to deadsnakes
29+
# - { ubuntu_version: "22.04", python_version: "3.12", opencv_version: "4.10.0", device: "cpu" }
30+
- {
31+
ubuntu_version: "22.04",
32+
python_version: "3.10",
33+
opencv_version: "4.10.0",
34+
device: "gpu",
35+
cuda_version: "12.5.0",
36+
}
37+
- {
38+
ubuntu_version: "22.04",
39+
python_version: "3.11",
40+
opencv_version: "4.10.0",
41+
device: "gpu",
42+
cuda_version: "12.5.0",
43+
}
44+
- {
45+
ubuntu_version: "22.04",
46+
python_version: "3.12",
47+
opencv_version: "4.10.0",
48+
device: "gpu",
49+
cuda_version: "12.5.0",
50+
}
2951
steps:
3052
- name: Checkout
3153
uses: actions/checkout@v4
@@ -45,6 +67,7 @@ jobs:
4567
UBUNTU_VERSION=${{ matrix.ubuntu_version }}
4668
PYTHON_VERSION=${{ matrix.python_version }}
4769
OPENCV_VERSION=${{ matrix.opencv_version }}
70+
CUDA_VERSION=${{ matrix.cuda_version }}
4871
file: ${{ matrix.device }}/Dockerfile
4972
# publish master
5073
push: ${{ github.ref == 'refs/heads/master' }}

cpu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN \
2121
# add sources for older pythons
2222
apt-get update -q --fix-missing && \
2323
apt-get install -y --no-install-recommends software-properties-common && \
24-
if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7)$ ]]; then \
24+
if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7|3.12)$ ]]; then \
2525
add-apt-repository ppa:deadsnakes/ppa ; \
2626
fi && \
2727
apt-add-repository universe && \

gpu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN \
2727
# add sources for older pythons
2828
apt-get update -qq --fix-missing && \
2929
apt-get install -y --no-install-recommends software-properties-common && \
30-
if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7)$ ]]; then \
30+
if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7|3.12)$ ]]; then \
3131
add-apt-repository ppa:deadsnakes/ppa ; \
3232
fi && \
3333
apt-add-repository universe && \

0 commit comments

Comments
 (0)