Administrivia and Go over README.

Author: rocky

README.rst

@@ -88,7 +88,9 @@ The way it does this though is by segregating consecutive Python versions into
 git branches:
 
 master
-   Python 3.6 and up (uses type annotations)
+   Python 3.11 and up
+python-3.6-to-3.10
+   Python 3.6 to python-3.10 (uses type annotations)
 python-3.3-to-3.5
    Python 3.3 through 3.5 (Generic Python 3)
 python-2.4

admin-tools/how-to-make-a-release.md

@@ -3,7 +3,9 @@ PACKAGE=uncompyle6
 
 # FIXME put some of the below in a common routine
 function finish {
-  cd $make_uncompyle6_newest_owd
+  if [[ -n "$make_uncompyle6_newest_owd" ]] then
+     cd $make_uncompyle6_newest_owd
+  fi
 }
 
 cd $(dirname ${BASH_SOURCE[0]})
@@ -21,24 +23,7 @@ cd ..
 source $PACKAGE/version.py
 echo $__version__
 
-for pyversion in $PYVERSIONS; do
-    echo --- $pyversion ---
-    if [[ ${pyversion:0:4} == "pypy" ]] ; then
-	echo "$pyversion - PyPy 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
-    python setup.py bdist_egg bdist_wheel
-    mv -v dist/${PACKAGE}-$__version__-{py2.py3,py$first_two}-none-any.whl
-done
-
-python ./setup.py sdist
+rm -fr build
+pip wheel --wheel-dir=dist .
+python -m build --sdist
 finish

admin-tools/make-dist-newest.sh

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61.0"]
+requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -12,15 +12,14 @@ description = "Python cross-version byte-code library and disassembler"
 dependencies = [
     "click",
     "spark-parser >= 1.8.9, < 1.9.2",
-    "xdis >= 6.1.0, < 6.2.0",
+    "xdis >= 6.1.0, < 6.3",
 ]
 readme = "README.rst"
-license = {text = "GPL"}
+license = "GPL-3.0-or-later"
 keywords = ["Python bytecode", "bytecode", "disassembler"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
     "Programming Language :: Python",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Programming Language :: Python :: 2.4",
@@ -63,3 +62,8 @@ version = {attr = "uncompyle6.version.__version__"}
 
 [tool.setuptools.packages.find]
 include = ["uncompyle6*"]  # Include all subpackages
+
+[tool.pyright]
+include = ["trepan"]
+# exclude = []
+ignore = ["dist", "docs", "tmp", ".cache"]