From 01ea45a3f5c1670adb42e6bb78d299b9da704400 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 25 Mar 2020 10:58:37 -0400
Subject: [PATCH 1/2] Administrivia - bump versions

---
 __pkginfo__.py              | 2 +-
 admin-tools/setup-master.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/__pkginfo__.py b/__pkginfo__.py
index 7b8c39be..8f89103a 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -58,7 +58,7 @@ entry_points       = {
     ]}
 ftp_url            = None
 install_requires   = ["spark-parser >= 1.8.9, < 1.9.0",
-                      "xdis >= 4.2.3, < 4.3.0"]
+                      "xdis >= 4.2.4, < 4.3.0"]
 
 license            = "GPL3"
 mailing_list       = "python-debugger@googlegroups.com"
diff --git a/admin-tools/setup-master.sh b/admin-tools/setup-master.sh
index ba14afcd..d5fa6451 100755
--- a/admin-tools/setup-master.sh
+++ b/admin-tools/setup-master.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-PYTHON_VERSION=3.7.6
+PYTHON_VERSION=3.7.7
 
 # FIXME put some of the below in a common routine
 function finish {

From b030a5ac2bf5283f86dc938a0062d93786d5d09d Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 28 Mar 2020 19:53:07 -0400
Subject: [PATCH 2/2] pypy 3.6 7.3.0 tolerance...

more work is need on the tests though
---
 test/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index b95180a3..3ff154a6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -78,7 +78,7 @@ check-3.8: check-bytecode
 	$(PYTHON) test_pythonlib.py --bytecode-3.8 --syntax-verify $(COMPILE)
 
 # FIXME
-#: this is called when running under pypy3.5-5.8.0 or pypy2-5.6.0
+#: this is called when running under pypy3.5-5.8.0, pypy2-5.6.0, or pypy3.6-7.3.0
 5.8 5.6:
 
 #: Check deparsing only, but from a different Python version
@@ -339,8 +339,8 @@ check-bytecode-pypy3.6: 7.1
 	$(PYTHON) test_pythonlib.py --bytecode-pypy3.6 --verify
 
 #: PyPy 5.0.x with Python 3.6.9
-check-bytecode-pypy3.6: 7.2
-7.2:
+check-bytecode-pypy3.6: 7.2 7.3
+7.3 7.2:
 	$(PYTHON) test_pythonlib.py --bytecode-pypy3.6-run --verify-run
 	$(PYTHON) test_pythonlib.py --bytecode-pypy3.6 --verify