From 3ad63071ac1b24698aa5698198f51f010b445c9b Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 26 Oct 2021 18:25:30 -0400
Subject: [PATCH] Admnistrivia: package info

---
 __pkginfo__.py                 |  5 +++++
 admin-tools/make-dist-older.sh | 10 +++++++---
 setup.py                       |  9 +++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/__pkginfo__.py b/__pkginfo__.py
index fc4acc03..47719c01 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -43,10 +43,12 @@ classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
+    "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 2.4",
     "Programming Language :: Python :: 2.5",
     "Programming Language :: Python :: 2.6",
     "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.0",
     "Programming Language :: Python :: 3.1",
     "Programming Language :: Python :: 3.2",
@@ -56,6 +58,9 @@ classifiers = [
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Software Development :: Debuggers",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
diff --git a/admin-tools/make-dist-older.sh b/admin-tools/make-dist-older.sh
index aee0ce92..0e418959 100755
--- a/admin-tools/make-dist-older.sh
+++ b/admin-tools/make-dist-older.sh
@@ -18,7 +18,7 @@ fi
 
 cd ..
 source $PACKAGE/version.py
-echo $VERSION
+echo $__version__
 
 for pyversion in $PYVERSIONS; do
     if ! pyenv local $pyversion ; then
@@ -29,11 +29,15 @@ for pyversion in $PYVERSIONS; do
     python setup.py bdist_egg
 done
 
+pyenv local 2.7.18
+python setup.py bdist_wheel
+mv -v dist/${PACKAGE}-$__version__-py2{.py3,}-none-any.whl
+
 # Pypi can only have one source tarball.
 # Tarballs can get created from the above setup, so make sure to remove them since we want
 # the tarball from master.
 
-tarball=dist/${PACKAGE}-$VERSION-tar.gz
+tarball=dist/${PACKAGE}-${__version_}_-tar.gz
 if [[ -f $tarball ]]; then
-    rm -v dist/${PACKAGE}-$VERSION-tar.gz
+    rm -v dist/${PACKAGE}-${__version__}-tar.gz
 fi
diff --git a/setup.py b/setup.py
index 1d1da4af..c88e7362 100755
--- a/setup.py
+++ b/setup.py
@@ -4,13 +4,18 @@ import sys
 """Setup script for the 'uncompyle6' distribution."""
 
 SYS_VERSION = sys.version_info[0:2]
-if not ((2, 6) <= SYS_VERSION <= (3, 9)):
-    mess = "Python Release 2.6 .. 3.9 are supported in this code branch."
+if not ((2, 4) <= SYS_VERSION < (3, 11)):
+    mess = "Python Release 2.6 .. 3.10 are supported in this code branch."
     if (2, 4) <= SYS_VERSION <= (2, 7):
         mess += (
             "\nFor your Python, version %s, use the python-2.4 code/branch."
             % sys.version[0:3]
         )
+    if (3, 3) <= SYS_VERSION < (3, 6):
+        mess += (
+            "\nFor your Python, version %s, use the python-3.3-to-3.5 code/branch."
+            % sys.version[0:3]
+        )
     elif SYS_VERSION < (2, 4):
         mess += (
             "\nThis package is not supported for Python version %s." % sys.version[0:3]