Merge branch 'master' into python-3.3-to-3.5

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

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

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

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)

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)

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)

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