Merge branch 'master' into python-3.6-to-3.10

Author: rocky

.github/workflows/osx.yml .github/workflows/macos.yml.github/workflows/osx.yml renamed to .github/workflows/macos.yml

@@ -1,4 +1,4 @@
-name: uncompyle6 (osx)
+name: uncompyle6 (MacOS)
 
 on:
   push:
@@ -14,15 +14,15 @@ jobs:
         os: [macOS]
         python-version: ['3.8', '3.10']
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         # Until the next xdis release
-        pip install --local -e "git+https://github.com/rocky/python-xdis.git@python-3.6-to-3.10#egg=xdis"
+        # pip install --local -e "git+https://github.com/rocky/python-xdis.git@python-3.6-to-3.10#egg=xdis"
         pip install -e .
         # Not sure why "pip install -e" doesn't work above
         # pip install click spark-parser xdis

.github/workflows/ubuntu.yml

@@ -13,15 +13,15 @@ jobs:
       matrix:
         python-version: ['3.8', '3.9']
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         # Until the next xdis release
-        pip install --local -e "git+https://github.com/rocky/python-xdis.git@python-3.6-to-3.10#egg=xdis"
+        # pip install --local -e "git+https://github.com/rocky/python-xdis.git@python-3.6-to-3.10#egg=xdis"
         pip install -e .
         # pip install click spark-parser xdis
         pip install -r requirements-dev.txt

.github/workflows/windows.yml

@@ -14,15 +14,15 @@ jobs:
         os: [windows]
         python-version: ['3.8']
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         # Until the next xdis release
-        pip install --local -e "git+https://github.com/rocky/python-xdis.git@python-3.6-to-3.10#egg=xdis"
+        # pip install --local -e "git+https://github.com/rocky/python-xdis.git@python-3.6-to-3.10#egg=xdis"
         pip install -e .
         # Not sure why "pip install -e" doesn't work above
         # pip install click spark-parser xdis

Makefile

@@ -43,7 +43,7 @@ check-3.0 check-3.1 check-3.2 check-3.6:
 check-3.7: pytest
 	$(MAKE) -C test check
 
-check-3.8 check-3.9 check-3.10 check-3.11 check-3.12 check-3.13:
+check-3.8 check-3.9 check-3.10 check-3.11 check-3.12 check-3.13 check-3.14:
 	$(MAKE) -C test check-3.8
 
 #:PyPy 2.6.1 PyPy 5.0.1, or PyPy 5.8.0-beta0

admin-tools/make-dist-newest.sh

@@ -23,10 +23,28 @@ cd ..
 source $PACKAGE/version.py
 echo $__version__
 
-# Python 3.12 and 3.13 are more restrictive in packaging
-pyenv local 3.11
-
 rm -fr build
-pip wheel --wheel-dir=dist .
+for pyversion in $PYVERSIONS; do
+    echo --- $pyversion ---
+    if [[ ${pyversion:0:4} == "pypy" ]] ; then
+	echo "$pyversion - PyPy does not get special packaging"
+	continue
+    elif [[ ${pyversion:0:4} == "graa" ]] ; then
+	echo "$pyversion - Graal does not get special packaging"
+	continue
+    fi
+    if ! pyenv local $pyversion ; then
+	exit $?
+    fi
+    # pip bdist_egg create too-general wheels. So
+    # we narrow that by moving the generated wheel.
+
+    # Pick out first two number of version, e.g. 3.5.1 -> 35
+    first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//')
+    rm -fr build
+    pip wheel --wheel-dir=dist -e .
+    mv -v dist/${PACKAGE}-${__version__}-{py3,py$first_two}-none-any.whl
+done
+
 python -m build --sdist
 finish

admin-tools/pyenv-newest-versions

@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
-export PYVERSIONS='3.11 3.12 3.13'
+export PYVERSIONS='3.11 3.12 3.13 3.14'

requirements-dev.txt

@@ -1,3 +1,3 @@
 flake8
 six
-pytest==3.2.5 # for 2.7 < PYTHON_VERSION <= 3.2 use pytest 2.9.2; for 3.1 2.10
+pytest==9.0.3 # for 2.7 < PYTHON_VERSION <= 3.2 use pytest 2.9.2; for 3.1 2.10

test/Makefile

@@ -80,7 +80,7 @@ check-3.8: check-bytecode
 	$(PYTHON) test_pythonlib.py --bytecode-3.8-run --verify-run
 	$(PYTHON) test_pythonlib.py --bytecode-3.8 --syntax-verify $(COMPILE)
 
-check-3.9 check-3.10 check-3.11 check-3.12 check-3.13: check-bytecode
+check-3.9 check-3.10 check-3.11 check-3.12 check-3.13 check-3.14: check-bytecode
 	@echo "Note that we do not support decompiling this version's bytecode - no 3.9 tests run"