From 77bbe49c32653081e75ecbb393267c150afd726d Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 20 Dec 2022 09:16:21 -0500
Subject: [PATCH 1/4] Change Python versions used in testing

to match what works on workflows CI
---
 .github/workflows/osx.yml     | 2 +-
 .github/workflows/ubuntu.yml  | 2 +-
 .github/workflows/windows.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index c08a884b..38eac9b0 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [macOS]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 0294b57b..bfabdfee 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 91084679..34d1ea55 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [windows]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.7, 3.8]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

From 1ffc58ac6d28702fa35774ac451d7c0d6e51c452 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 22 Dec 2022 22:44:30 -0500
Subject: [PATCH 2/4] Bump list of newest versions

---
 admin-tools/pyenv-newest-versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-tools/pyenv-newest-versions b/admin-tools/pyenv-newest-versions
index f2c5ebcc..4350d1bc 100644
--- a/admin-tools/pyenv-newest-versions
+++ b/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.6.15 pypy3.6-7.3.1 3.7.14 pypy3.8-7.3.9 pyston-2.3.3 3.8.14'
+export PYVERSIONS='3.6.15 pypy3.6-7.3.1 3.7.16 pypy-3.7-3.9 pypy3.8-7.3.10 pyston-2.3.5 3.8.14'

From 6ba779b915b42335f8f8a146799e5b624180118b Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 22 Dec 2022 22:47:14 -0500
Subject: [PATCH 3/4] Get ready for release 3.9.0

---
 NEWS.md                           | 24 +++++++++++++++++++++++-
 admin-tools/pyenv-newest-versions |  2 +-
 uncompyle6/version.py             |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 5125ccf7..9f33e295 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,26 @@
-3.8.0: 2020-10-29
+3.9.0: 2022-12-22
+=================
+
+* deparse generator expressions for Python 3.0 .. 3.2
+* Python 3.0 list comprehension.
+* Fix Issues #310, #344, #377, #391, #409, #414
+* Limited support for 3.8+ f-string "=" specifier
+* Correct 2.5-7 relative import formatting
+* Miscellaneous bug fixing
+* remove \n in lambda
+* Python 2.6 gramar cleanup
+* Correct some Python 2.6 chain compare decompilation
+* Ensure no parenthesis subscript slices
+* Correct 2.x formatting "slice2" nonterminal
+* Correct 3.7 imports
+* Improve "async for" parsing
+* Handle BUILD_MAP opcode
+* match Python AT better
+* Correct 3.7 positional args
+* PyPy 3.7 and PyPy 3.8 support
+* Miscellaneous linting, isorting, blacking
+
+3.8.0: 2021-10-29
 =================
 
 * Better handling of invalid bytecode magic
diff --git a/admin-tools/pyenv-newest-versions b/admin-tools/pyenv-newest-versions
index 4350d1bc..f332631e 100644
--- a/admin-tools/pyenv-newest-versions
+++ b/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.6.15 pypy3.6-7.3.1 3.7.16 pypy-3.7-3.9 pypy3.8-7.3.10 pyston-2.3.5 3.8.14'
+export PYVERSIONS='3.6.15 pypy3.6-7.3.1 3.7.16 pypy-3.7-7.3.9 pypy3.8-7.3.10 pyston-2.3.5 3.8.16'
diff --git a/uncompyle6/version.py b/uncompyle6/version.py
index 44c88a7d..e6a3e3c7 100644
--- a/uncompyle6/version.py
+++ b/uncompyle6/version.py
@@ -14,4 +14,4 @@
 # This file is suitable for sourcing inside POSIX shell as
 # well as importing into Python
 # fmt: off
-__version__="3.9.0a1"  # noqa
+__version__="3.9.0"  # noqa

From 3ea0d67be9cdffa737547c408c98fba444424054 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 22 Dec 2022 23:33:49 -0500
Subject: [PATCH 4/4] Add check program for Python 3.3-3.5

---
 admin-tools/check-3.3-3.5-versions.sh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100755 admin-tools/check-3.3-3.5-versions.sh

diff --git a/admin-tools/check-3.3-3.5-versions.sh b/admin-tools/check-3.3-3.5-versions.sh
new file mode 100755
index 00000000..5b451577
--- /dev/null
+++ b/admin-tools/check-3.3-3.5-versions.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+function finish {
+  cd $owd
+}
+owd=$(pwd)
+trap finish EXIT
+
+cd $(dirname ${BASH_SOURCE[0]})
+if ! source ./pyenv-3.3-3.5-versions ; then
+    exit $?
+fi
+if ! source ./setup-python-3.3.sh ; then
+    exit $?
+fi
+
+cd ..
+for version in $PYVERSIONS; do
+    echo --- $version ---
+    if ! pyenv local $version ; then
+	exit $?
+    fi
+    make clean && python setup.py develop
+    if ! make check ; then
+	exit $?
+    fi
+    echo === $version ===
+done