Administrivia

Author: rocky

admin-tools/setup-python-3.3.sh

@@ -1,25 +1,18 @@
 #!/bin/bash
 PYTHON_VERSION=3.3
 
-# FIXME put some of the below in a common routine
-function checkout_version {
-    local repo=$1
-    version=${2:-python-3.3-to-3.5}
-    echo Checking out $version on $repo ...
-    (cd ../$repo && git checkout $version && pyenv local $PYTHON_VERSION) && \
-	git pull
-    return $?
-}
-
-export PATH=$HOME/.pyenv/bin/pyenv:$PATH
-trepan3k_owd=$(pwd)
 bs=${BASH_SOURCE[0]}
 if [[ $0 == $bs ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
 
+export PATH=$HOME/.pyenv/bin/pyenv:$PATH
+trepan3k_owd=$(pwd)
+
 mydir=$(dirname $bs)
+cd $mydir
+. ./checkout_common.sh
 (cd $mydir/.. && \
      setup_version python-uncompyle6 python-3.3 && \
      setup_version python-xdis python-3.3 && \
@@ -33,4 +26,4 @@ mydir=$(dirname $bs)
 cd $trepan3k_owd
 rm -v */.python-version 2>/dev/null || true
 
-git checkout python-3.3-to-3.5 && pyenv local $PYTHON_VERSION && git pull
+checkout_finish python-3.3-to-3.5

admin-tools/setup-python-3.6.sh

@@ -1,14 +1,13 @@
 #!/bin/bash
 # Check out 3.6-to-3.10 branch and dependent development branches
+PYTHON_VERSION=3.6
 
 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
-
 export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 trepan3k_owd=$(pwd)
 mydir=$(dirname $bs)