Merge pull request #12426 from PennyDreadfulMTG/python-3.12

Upgrade to Python 3.12

.github/workflows/build.yml

@@ -8,10 +8,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.10
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10.6'
+        python-version: '3.12'
         cache: 'pipenv'
     - uses: PennyDreadfulMTG/setup-linters@main
     - name: Install dependencies
@@ -26,10 +26,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.10
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.12'
         cache: 'pipenv'
     - uses: PennyDreadfulMTG/setup-linters@main
     - name: Install dependencies
@@ -51,10 +51,10 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Set up Python 3.10
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.12'
         cache: 'pipenv'
     - uses: getong/mariadb-action@v1.1
       with:
@@ -82,10 +82,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.10
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.12'
         cache: 'pipenv'
     - name: Setup Node.js environment
       uses: actions/setup-node@v4.0.2

.github/workflows/isort.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.10
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.12'
         cache: 'pipenv'
     - name: Install dependencies
       run: |

.github/workflows/repip.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.10
+    - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.12'
         cache: 'pipenv'
     - name: Install dependencies
       run: |

Dockerfile

@@ -1,20 +1,20 @@
-FROM nikolaik/python-nodejs:python3.10-nodejs12 AS python
+FROM nikolaik/python-nodejs:python3.12-nodejs22 AS python
 
 WORKDIR /pdm
 RUN pip install pipenv
 COPY Pipfile Pipfile.lock ./
 RUN pipenv sync
 CMD ["/bin/bash"]
 
-FROM nikolaik/python-nodejs:python3.10-nodejs12 AS js
+FROM nikolaik/python-nodejs:python3.12-nodejs22 AS js
 
 WORKDIR /restore
 COPY package*.json ./
 RUN npm ci --verbose
 
-FROM nikolaik/python-nodejs:python3.10-nodejs12
+FROM nikolaik/python-nodejs:python3.12-nodejs22
 
-COPY --from=python /usr/local/lib/python3.10/site-packages/ /usr/local/lib/python3.10/site-packages/
+COPY --from=python /usr/local/lib/python3.12/site-packages/ /usr/local/lib/python3.12/site-packages/
 COPY --from=python /root/.local/share/virtualenvs/ /root/.local/share/virtualenvs/
 COPY --from=js /restore/node_modules /pdm/node_modules
 

Pipfile

@@ -20,7 +20,6 @@ init-cards = "python run.py init-cards"
 flake8 = "==7.0.0"
 flake8-quotes = "*"
 flake8-bugbear = "*"
-flake8-commas = "*"
 flake8-import-graph = "*"
 flake8-raise = "*"
 flake8-deprecated = "*"
@@ -110,4 +109,4 @@ discord-typings = "*"
 anyascii = "*"
 
 [requires]
-python_version = "3.10"
+python_version = "3.12"

README.md

@@ -47,7 +47,7 @@ Contributions are very welcome. Please join the Discord at <https://pennydreadfu
 - docker-compose up
 
 If you plan on running things outside of the containers (eg: dev.py or logsite):
-- Install python 3.10
+- Install python 3.12
 - Install pipenv
 - Install npm
 - git clone <https://github.com/PennyDreadfulMTG/Penny-Dreadful-Tools.git>
@@ -69,7 +69,7 @@ If you plan on running things outside of the containers (eg: dev.py or logsite):
 ## Manual Development Environment Setup (Non-docker instructions)
 
 - Install MariaDB 10.0+
-- Install python 3.10
+- Install python 3.12
 - Install pipenv
 - Install npm
 - git clone <https://github.com/PennyDreadfulMTG/Penny-Dreadful-Tools.git>
@@ -116,5 +116,4 @@ Check the dev.py source code for the full set of options including `unit`, `type
 
 ## Working on React components
 
-- Run logsite
 - pipenv run python dev.py watch # Builds bundle.js after every file change.