Add python 3.12, drop 3.7

wodby · Oct 3, 2023 · 2f242dc · 2f242dc
1 parent 38982d8
commit 2f242dc
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 37 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -11,15 +11,24 @@ on:
   pull_request:
 
 env:
+  PYTHON312: '3.12.0'
   PYTHON311: '3.11.6'
   PYTHON310: '3.10.13'
   PYTHON39: '3.9.18'
   PYTHON38: '3.8.18'
-  PYTHON37: '3.7.17'
   DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
+  python312:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: docker/setup-buildx-action@v1
+    - uses: ./.github/actions
+      with:
+        version: ${{ env.PYTHON312 }}
+        tags: 3.12,3,latest
   python311:
     runs-on: ubuntu-latest
     steps:
@@ -28,7 +37,7 @@ jobs:
     - uses: ./.github/actions
       with:
         version: ${{ env.PYTHON311 }}
-        tags: 3.11,3,latest
+        tags: '3.11'
   python310:
     runs-on: ubuntu-latest
     steps:
@@ -56,16 +65,17 @@ jobs:
       with:
         version: ${{ env.PYTHON38 }}
         tags: 3.8
-  python37:
+  ### dev
+  python312-dev:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - uses: docker/setup-buildx-action@v1
     - uses: ./.github/actions
       with:
-        version: ${{ env.PYTHON37 }}
-        tags: 3.7
-  ### dev
+        version: ${{ env.PYTHON312 }}
+        dev: 1
+        tags: 3.12-dev,3-dev,dev
   python311-dev:
     runs-on: ubuntu-latest
     steps:
@@ -75,7 +85,7 @@ jobs:
       with:
         version: ${{ env.PYTHON311 }}
         dev: 1
-        tags: 3.11-dev,3-dev,dev
+        tags: 3.11-dev
   python310-dev:
     runs-on: ubuntu-latest
     steps:
@@ -106,17 +116,23 @@ jobs:
         version: ${{ env.PYTHON38 }}
         dev: 1
         tags: 3.8-dev
-  python37-dev:
+  ### dev-macos
+  python312-dev-macos:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: docker/setup-qemu-action@v1
+      with:
+        platforms: amd64,arm64
     - uses: docker/setup-buildx-action@v1
     - uses: ./.github/actions
       with:
-        version: ${{ env.PYTHON37 }}
+        version: ${{ env.PYTHON312 }}
         dev: 1
-        tags: 3.7-dev
-  ### dev-macos
+        user_id: 501
+        group_id: 20
+        tags: 3.12-dev-macos,3-dev-macos,dev-macos
+        platform: linux/amd64,linux/arm64
   python311-dev-macos:
     runs-on: ubuntu-latest
     steps:
@@ -131,7 +147,7 @@ jobs:
         dev: 1
         user_id: 501
         group_id: 20
-        tags: 3.11-dev-macos,3-dev-macos,dev-macos
+        tags: 3.11-dev-macos
         platform: linux/amd64,linux/arm64
   python310-dev-macos:
     runs-on: ubuntu-latest
@@ -181,19 +197,3 @@ jobs:
         group_id: 20
         tags: 3.8-dev-macos
         platform: linux/amd64,linux/arm64
-  python37-dev-macos:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: docker/setup-qemu-action@v1
-      with:
-        platforms: amd64,arm64
-    - uses: docker/setup-buildx-action@v1
-    - uses: ./.github/actions
-      with:
-        version: ${{ env.PYTHON37 }}
-        dev: 1
-        user_id: 501
-        group_id: 20
-        tags: 3.7-dev-macos
-        platform: linux/amd64,linux/arm64
diff --git a/.python b/.python
@@ -1,5 +1,5 @@
+3.12.0#2023-10-03T07:37:21.508632Z
 3.11.6#2023-10-03T07:37:21.508632Z
 3.10.13#2023-09-21T09:08:00.784103Z
 3.9.18#2023-09-21T15:38:38.299714Z
-3.8.18#2023-09-21T15:36:44.165841Z
-3.7.17#2023-09-21T15:34:38.301307Z
+3.8.18#2023-09-21T15:36:44.165841Z
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 -include env_make
 
-PYTHON_VER ?= 3.11.6
+PYTHON_VER ?= 3.12.0
 PYTHON_VER_MINOR := $(shell v='$(PYTHON_VER)'; echo "$${v%.*}")
 
 REPO = wodby/python

diff --git a/README.md b/README.md
@@ -33,21 +33,21 @@ About images:
 
 Supported tags and respective `Dockerfile` links:
 
-- `3.11`, `3`, `latest` [_(Dockerfile)_]
+- `3.12`, `3`, `latest` [_(Dockerfile)_]
+- `3.11` [_(Dockerfile)_]
 - `3.10` [_(Dockerfile)_]
 - `3.9` [_(Dockerfile)_]
 - `3.8` [_(Dockerfile)_]
-- `3.7` [_(Dockerfile)_]
-- `3.11-dev`, `3-dev` [_(Dockerfile)_]
+- `3.12-dev`, `3-dev` [_(Dockerfile)_]
+- `3.11-dev` [_(Dockerfile)_]
 - `3.10-dev` [_(Dockerfile)_]
 - `3.9-dev` [_(Dockerfile)_]
 - `3.8-dev` [_(Dockerfile)_]
-- `3.7-dev` [_(Dockerfile)_]
-- `3.11-dev-macos`, `3-dev-macos` [_(Dockerfile)_]
+- `3.12-dev-macos`, `3-dev-macos` [_(Dockerfile)_]
+- `3.11-dev-macos` [_(Dockerfile)_]
 - `3.10-dev-macos` [_(Dockerfile)_]
 - `3.9-dev-macos` [_(Dockerfile)_]
 - `3.8-dev-macos` [_(Dockerfile)_]
-- `3.7-dev-macos` [_(Dockerfile)_]
 
 [_(Dockerfile)_]: https://github.com/wodby/python/tree/master/Dockerfile