From f0e1a7beba59a8a142616caf884d92935b65be99 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 8 Oct 2024 17:09:07 -0400
Subject: [PATCH 1/2] Try unpinning setuptools

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 799e73b4..b8e8c462 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "setuptools>=71.0.3",
+    "setuptools",
     # "setuptools>=59.6.0", # for 3.6
 ]
 

From 193c262ffbf03dd0d29b5095fb7f604e9bbf047a Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 9 Oct 2024 03:55:30 -0400
Subject: [PATCH 2/2] Administrivia

Folloow branching of other projects in this ilk
---
 admin-tools/merge-for-3.3.sh    |  2 +-
 admin-tools/merge-for-3.6.sh    |  7 +++++++
 admin-tools/setup-master.sh     |  4 ++--
 admin-tools/setup-python-2.4.sh |  2 +-
 admin-tools/setup-python-3.0.sh |  2 +-
 admin-tools/setup-python-3.3.sh |  2 +-
 admin-tools/setup-python-3.6.sh | 21 +++++++++++++++++++++
 7 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100755 admin-tools/merge-for-3.6.sh
 create mode 100755 admin-tools/setup-python-3.6.sh

diff --git a/admin-tools/merge-for-3.3.sh b/admin-tools/merge-for-3.3.sh
index 7915bda3..8b73afee 100755
--- a/admin-tools/merge-for-3.3.sh
+++ b/admin-tools/merge-for-3.3.sh
@@ -2,6 +2,6 @@
 uncompyle6_merge_33_owd=$(pwd)
 cd $(dirname ${BASH_SOURCE[0]})
 if . ./setup-python-3.3.sh; then
-    git merge master
+    git merge python-3.6-to-3.10
 fi
 cd $uncompyle6_merge_33_owd
diff --git a/admin-tools/merge-for-3.6.sh b/admin-tools/merge-for-3.6.sh
new file mode 100755
index 00000000..7915bda3
--- /dev/null
+++ b/admin-tools/merge-for-3.6.sh
@@ -0,0 +1,7 @@
+#/bin/bash
+uncompyle6_merge_33_owd=$(pwd)
+cd $(dirname ${BASH_SOURCE[0]})
+if . ./setup-python-3.3.sh; then
+    git merge master
+fi
+cd $uncompyle6_merge_33_owd
diff --git a/admin-tools/setup-master.sh b/admin-tools/setup-master.sh
index 98dba9d6..3c20608c 100755
--- a/admin-tools/setup-master.sh
+++ b/admin-tools/setup-master.sh
@@ -6,7 +6,7 @@ if [[ $0 == $bs ]] ; then
     exit 1
 fi
 
-PYTHON_VERSION=3.8
+PYTHON_VERSION=3.12
 
 uncompyle6_owd=$(pwd)
 mydir=$(dirname $bs)
@@ -16,5 +16,5 @@ cd $mydir
 cd $fulldir/..
 (cd $fulldir/.. && \
      setup_version python-spark master && \
-     setup_version python-xdis python-3.6 )
+     setup_version python-xdis master )
 checkout_finish master
diff --git a/admin-tools/setup-python-2.4.sh b/admin-tools/setup-python-2.4.sh
index 386c6284..6efc2ef3 100755
--- a/admin-tools/setup-python-2.4.sh
+++ b/admin-tools/setup-python-2.4.sh
@@ -7,7 +7,7 @@ if [[ $0 == $bs ]] ; then
     exit 1
 fi
 
-PYTHON_VERSION=2.4.6
+PYTHON_VERSION=2.4
 
 uncompyle6_owd=$(pwd)
 mydir=$(dirname $bs)
diff --git a/admin-tools/setup-python-3.0.sh b/admin-tools/setup-python-3.0.sh
index 495ca571..f4e81395 100644
--- a/admin-tools/setup-python-3.0.sh
+++ b/admin-tools/setup-python-3.0.sh
@@ -6,7 +6,7 @@ if [[ $0 == $bs ]] ; then
     exit 1
 fi
 
-PYTHON_VERSION=3.0.1
+PYTHON_VERSION=3.0
 
 uncompyle6_owd=$(pwd)
 mydir=$(dirname $bs)
diff --git a/admin-tools/setup-python-3.3.sh b/admin-tools/setup-python-3.3.sh
index 417f54f6..f1d41ebf 100755
--- a/admin-tools/setup-python-3.3.sh
+++ b/admin-tools/setup-python-3.3.sh
@@ -6,7 +6,7 @@ if [[ $0 == $bs ]] ; then
     exit 1
 fi
 
-PYTHON_VERSION=3.3.7
+PYTHON_VERSION=3.3
 
 uncompyle6_owd=$(pwd)
 mydir=$(dirname $bs)
diff --git a/admin-tools/setup-python-3.6.sh b/admin-tools/setup-python-3.6.sh
new file mode 100755
index 00000000..016485b9
--- /dev/null
+++ b/admin-tools/setup-python-3.6.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+# Check out python-3.6-to-3.10 and dependent development branches.
+bs=${BASH_SOURCE[0]}
+if [[ $0 == $bs ]] ; then
+    echo "This script should be *sourced* rather than run directly through bash"
+    exit 1
+fi
+
+PYTHON_VERSION=3.6
+
+uncompyle6_owd=$(pwd)
+mydir=$(dirname $bs)
+cd $mydir
+fulldir=$(readlink -f $mydir)
+. ./checkout_common.sh
+cd $fulldir/..
+(cd $fulldir/.. && \
+     setup_version python-spark python-3.6 && \
+     setup_version python-xdis python-3.6 )
+
+checkout_finish python-3.6-to-3.10