Python 3.12

.github/workflows/release.yaml

@@ -8,12 +8,15 @@ concurrency:
   group: release
   cancel-in-progress: false
 
+env:
+   ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 jobs:
 
   release:
     runs-on: ubuntu-latest
     container:
-      image: danielflook/python-minifier-build:python3.11-2022-10-25
+      image: danielflook/python-minifier-build:python3.12-2024-01-12
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -25,8 +28,8 @@ jobs:
 
       - name: Build package
         run: |
-          pip3 install --upgrade setuptools wheel
-          python3 setup.py sdist bdist_wheel --universal
+          pip3 install --upgrade build
+          python3 -m build
 
       - uses: actions/upload-artifact@v3
         with:
@@ -51,7 +54,7 @@ jobs:
       id-token: write
     environment:
       name: pypi
-      url: https://pypi.org/project/python-minifier/
+      url: https://pypi.org/project/python-minifier/${{ github.event.release.tag_name }}
     steps:
       - uses: actions/download-artifact@v3
         with:

.github/workflows/release_test.yaml

@@ -2,41 +2,81 @@ name: Release Test
 
 on: [push]
 
+env:
+   ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 jobs:
 
-  package:
-    name: Create Package
+  package_python3:
+    name: Create sdist and Python 3 Wheel
     runs-on: ubuntu-latest
+    outputs:
+        sdist: ${{ steps.package.outputs.sdist }}
+        wheel: ${{ steps.package.outputs.wheel }}
     container:
-      image: danielflook/python-minifier-build:python3.11-2022-10-25
+      image: danielflook/python-minifier-build:python3.12-2024-01-12
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          show-progress: false
 
       - name: Set version statically
         run: |
-          VERSION="$(python3 setup.py --version)"
+          pip3 install setuptools_scm
+          VERSION="$(python3 -m setuptools_scm)"
           sed -i "s/setup_requires=.*/version='$VERSION',/; s/use_scm_version=.*//" setup.py
 
       - name: Create Packages
+        id: package
         run: |
-          pip3 install --upgrade setuptools wheel twine
-          python3 setup.py sdist bdist_wheel --universal
+          pip3 install --upgrade build
+          python3 -m build
+
+          echo "sdist=$(find dist -name '*.tar.gz' -printf "%f\n")" >> "$GITHUB_OUTPUT"
+          echo "wheel=$(find dist -name '*-py3-*.whl' -printf "%f\n")" >> "$GITHUB_OUTPUT"
 
       - uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist/
           if-no-files-found: error
 
-  test_docs:
+  package_python2:
+    name: Create Python 2 Wheel
+    runs-on: ubuntu-latest
+    needs: [package_python3]
+    outputs:
+        wheel: ${{ steps.package.outputs.wheel }}
+    container:
+      image: danielflook/python-minifier-build:python2.7-2024-01-12
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: dist
+          path: dist/
+
+      - name: Build wheel
+        id: package
+        run: |
+          dnf install -y findutils
+          pip install --upgrade wheel
+          pip wheel dist/${{ needs.package_python3.outputs.sdist }} -w dist
+          echo "wheel=$(find dist -name '*-py2-*.whl' -printf "%f\n")" >> "$GITHUB_OUTPUT"
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: dist
+          path: dist/
+          if-no-files-found: error
+
+  documentation:
     name: Test Documentation
     runs-on: ubuntu-latest
-    needs: [package]
+    needs: [package_python3]
     container:
-      image: danielflook/python-minifier-build:python3.11-2022-10-25
+      image: danielflook/python-minifier-build:python3.12-2024-01-12
     steps:
       - uses: actions/download-artifact@v3
         with:
@@ -45,11 +85,14 @@ jobs:
 
       - name: Install package
         run: |
-          pip3 install dist/*.tar.gz
+          pip3 install dist/${{needs.package_python3.outputs.sdist}}
           pyminify --version
 
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          show-progress: false
 
       - name: Build documentation
         run: |
@@ -59,13 +102,14 @@ jobs:
   test_package:
     name: Test Package
     runs-on: ubuntu-latest
-    needs: [package]
+    needs: [package_python3, package_python2]
     strategy:
+      fail-fast: false
       matrix:
-        python: ["2.7", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
-        package_type: [.tar.gz, .whl]
+        python: ["2.7", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        package_type: [sdist, wheel]
     container:
-      image: danielflook/python-minifier-build:python${{ matrix.python }}-2022-10-25
+      image: danielflook/python-minifier-build:python${{ matrix.python }}-2024-01-12
     steps:
       - uses: actions/download-artifact@v3
         with:
@@ -74,11 +118,21 @@ jobs:
 
       - name: Install package
         run: |
-          pip${{ matrix.python }} install dist/*${{ matrix.package_type }}
+          if [[ "${{ matrix.package_type }}" == "sdist" ]]; then
+            pip${{ matrix.python }} install dist/${{needs.package_python3.outputs.sdist}}
+          elif [[ "${{ matrix.python }}" == "2.7" ]]; then
+            pip${{ matrix.python }} install dist/${{needs.package_python2.outputs.wheel}}
+          else
+            pip${{ matrix.python }} install dist/${{needs.package_python3.outputs.wheel}}
+          fi
+
           pyminify --version
 
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          show-progress: false
 
       - name: Test pyminify
         run: |
@@ -90,12 +144,12 @@ jobs:
 
   test_typing:
     runs-on: ubuntu-latest
-    needs: [package]
+    needs: [package_python3]
     strategy:
       matrix:
-        package_type: [.tar.gz, .whl]
+        package_type: [sdist, wheel]
     container:
-      image: danielflook/python-minifier-build:python3.11-2022-10-25
+      image: danielflook/python-minifier-build:python3.12-2024-01-12
     steps:
       - uses: actions/download-artifact@v3
         with:
@@ -104,19 +158,26 @@ jobs:
 
       - name: Install package
         run: |
-          pip3.11 install dist/*${{ matrix.package_type }}
+          if [[ "${{ matrix.package_type }}" == "sdist" ]]; then
+            pip3.12 install dist/${{needs.package_python3.outputs.sdist}}
+          else
+            pip3.12 install dist/${{needs.package_python3.outputs.wheel}}
+          fi
 
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          show-progress: false
 
       - name: Test typing
         run: |
-          pip3.11 install mypy types-setuptools
+          pip3.12 install mypy types-setuptools
           mypy --strict typing_test/test_typing.py
 
           if mypy --strict typing_test/test_badtyping.py; then
             echo "Bad types weren't detected"
             exit 1
           fi
 
-          stubtest python_minifier
+          stubtest python_minifier --allowlist typing_test/stubtest-allowlist.txt

.github/workflows/test.yaml

@@ -2,6 +2,9 @@ name: Unit Test
 
 on: [push]
 
+env:
+   ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 jobs:
 
   test:
@@ -10,9 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["python2.7", "python3.3", "python3.4", "python3.5", "python3.6", "python3.7", "python3.8", "python3.9", "python3.10", "python3.11", "pypy", "pypy3"]
+        python: ["python2.7", "python3.3", "python3.4", "python3.5", "python3.6", "python3.7", "python3.8", "python3.9", "python3.10", "python3.11", "python3.12", "pypy", "pypy3"]
     container:
-      image: danielflook/python-minifier-build:${{ matrix.python }}-2022-10-25
+      image: danielflook/python-minifier-build:${{ matrix.python }}-2024-01-12
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/test_corpus.yaml

@@ -34,17 +34,20 @@ on:
         required: false
         default: false
 
+env:
+   ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 jobs:
   generate_results:
     name: Minify Corpus
     runs-on: self-hosted
     strategy:
       fail-fast: false
       matrix:
-        python: ["python2.7", "python3.3", "python3.4", "python3.5", "python3.6", "python3.7", "python3.8", "python3.9", "python3.10", "python3.11"]
+        python: ["2.7", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         ref: ["${{ inputs.ref }}", "${{ inputs.base-ref }}"]
     container:
-      image: danielflook/python-minifier-build:${{ matrix.python }}-2022-10-25
+      image: danielflook/python-minifier-build:python${{ matrix.python }}-2024-01-12
       volumes:
         - /corpus:/corpus
         - /corpus-results:/corpus-results
@@ -64,31 +67,43 @@ jobs:
           path: python-minifier
 
       - name: Install ref
+        id: install
         run: |
           set -ex
           (cd python-minifier && git log --pretty=format:'%H' -n 1) > sha.txt
           cat sha.txt
           VERSION=0.0.0
           sed -i "s/setup_requires=.*/version='$VERSION',/; s/use_scm_version=.*//" python-minifier/setup.py
-          (cd python-minifier && ${{matrix.python}} setup.py install)
+
+          if ! pip${{ matrix.python }} install python-minifier/ 2>stderr.log; then
+            echo stderr.log
+
+            if grep -q -E 'require a different python version|requires a different Python' stderr.log; then
+              echo "${{ matrix.ref }} doesn't support Python ${{ matrix.python }}. Skipping."
+              echo "skip=true" >> "$GITHUB_OUTPUT"
+            else
+              exit 1
+            fi
+          fi
 
       - name: Run tests
+        if: steps.install.outputs.skip != 'true'
         run: |
-          if [[ "${{ matrix.python }}" == "python3.3" || "${{ matrix.python }}" == "python3.4" || "${{ matrix.python }}" == "python3.5" ]]; then
+          if [[ "${{ matrix.python }}" == "3.3" || "${{ matrix.python }}" == "3.4" || "${{ matrix.python }}" == "3.5" ]]; then
             # These versions randomise the hash seed, but don't preserve dict order
             # This affects how names are assigned. Disable the hash randomisation for
             # deterministic results.
             export PYTHONHASHSEED=0
           fi
 
-          ${{matrix.python}} workflow/corpus_test/generate_results.py /corpus /corpus-results $(<sha.txt) ${{ inputs.regenerate-results }}
+          python${{matrix.python}} workflow/corpus_test/generate_results.py /corpus /corpus-results $(<sha.txt) ${{ inputs.regenerate-results }}
 
   generate_report:
     name: Generate Report
     needs: generate_results
     runs-on: self-hosted
     container:
-      image: danielflook/python-minifier-build:python3.11-2022-10-25
+      image: danielflook/python-minifier-build:python3.12-2024-01-12
       volumes:
         - /corpus-results:/corpus-results
     if: ${{ always() }}
@@ -125,4 +140,4 @@ jobs:
 
       - name: Generate Report
         run: |
-          python3.11 workflow/corpus_test/generate_report.py /corpus-results ${{ inputs.ref }} $(<sha.txt) ${{ inputs.base-ref }} $(<base-sha.txt) >> $GITHUB_STEP_SUMMARY
+          python3.12 workflow/corpus_test/generate_report.py /corpus-results ${{ inputs.ref }} $(<sha.txt) ${{ inputs.base-ref }} $(<base-sha.txt) >> $GITHUB_STEP_SUMMARY

.github/workflows/verify_release.yaml

@@ -8,14 +8,17 @@ on:
         required: true
         type: string
 
+env:
+   ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 jobs:
   test_package:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["2.7", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python: ["2.7", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
     container:
-      image: danielflook/python-minifier-build:python${{ matrix.python }}-2022-10-25
+      image: danielflook/python-minifier-build:python${{ matrix.python }}-2024-01-12
     steps:
       - name: Test
         run: |

.github/workflows/xtest.yaml

@@ -2,6 +2,9 @@ name: Regression Test
 
 on: [pull_request]
 
+env:
+   ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 jobs:
 
   test:
@@ -10,10 +13,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["python2.7", "python3.3", "python3.4", "python3.5", "python3.6", "python3.7", "python3.8", "python3.9", "python3.10", "python3.11", "pypy3"]
+        python: ["python2.7", "python3.3", "python3.4", "python3.5", "python3.6", "python3.7", "python3.8", "python3.9", "python3.10", "python3.11", "python3.12", "pypy3"]
     container:
-      image: danielflook/python-minifier-build:${{ matrix.python }}-2022-10-25
+      image: danielflook/python-minifier-build:${{ matrix.python }}-2024-01-12
     steps:
+      - name: Cleanup
+        run: |
+          echo rm -vrf "$HOME/.*" "$HOME/*" "$GITHUB_WORKSPACE/.*" "$GITHUB_WORKSPACE/*"
+          rm -vrf "$HOME/.*" "$HOME/*" "$GITHUB_WORKSPACE/.*" "$GITHUB_WORKSPACE/*"
+
       - name: Checkout
         uses: actions/checkout@v3
         with:
@@ -35,7 +43,7 @@ jobs:
             (cd /usr/lib64/pypy3-7.0/lib-python/3/test && pypy3 make_ssl_certs.py)
           fi
 
-          tox -r -e $(echo "${{ matrix.python }}" | tr -d .) xtest
+          tox -r -e $(echo "${{ matrix.python }}" | tr -d .) -- xtest
 
   test-corpus:
     needs: test