Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add python 3.12 #42

Merged
merged 14 commits into from
Jul 8, 2024
Merged

add python 3.12 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1630df7
add python `3.12`
Borda Dec 31, 2023
bdde9ba
apt-get upgrade
Borda Dec 31, 2023
02c1925
Revert "apt-get upgrade"
Borda Dec 31, 2023
3746146
Merge branch 'master' into bump/py-3.12
Borda Jan 1, 2024
5d53214
Merge branch 'master' into bump/py-3.12
Borda Jan 9, 2024
06b3666
Merge branch 'master' into bump/py-3.12
Borda Jul 8, 2024
004dec9
24.04
Borda Jul 8, 2024
973032f
ppa:deadsnakes/ppa
Borda Jul 8, 2024
953dc78
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 8, 2024
4da2c5f
skip cpu
Borda Jul 8, 2024
5fc35ea
Merge branch 'master' into bump/py-3.12
Borda Jul 8, 2024
615404c
py 3.13
Borda Jul 8, 2024
f74e863
Merge branch 'bump/py-3.12' of https://github.com/Borda/docker_python…
Borda Jul 8, 2024
5737d77
Revert "py 3.13"
Borda Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions .github/workflows/docker-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion gpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down