Admnistrivia

Author: rocky

admin-tools/merge-for-3.0.sh

@@ -1,7 +1,7 @@
 #/bin/bash
-owd=$(pwd)
+trepan_merge_30_owd=$(pwd)
 cd $(dirname ${BASH_SOURCE[0]})
 if . ./setup-python-3.0.sh; then
-    git merge python-3.3-to-3.5
+    git merge python-3.2-to-3.5
 fi
-cd $owd
+cd $trepan_merge_30_owd

admin-tools/merge-for-3.2.sh

@@ -1,7 +1,7 @@
 #/bin/bash
-owd=$(pwd)
+trepan_merge_32_owd=$(pwd)
 cd $(dirname ${BASH_SOURCE[0]})
 if . ./setup-python-3.2.sh; then
     git merge python-3.6-to-3.10
 fi
-cd $owd
+cd $trepan_merge_32_owd

admin-tools/merge-for-3.3.sh

@@ -1,7 +1,7 @@
 #/bin/bash
-owd=$(pwd)
+trepan_merge_36_owd=$(pwd)
 cd $(dirname ${BASH_SOURCE[0]})
 if . ./setup-python-3.6.sh; then
     git merge master
 fi
-cd $owd
+cd $trepan_merge_36_owd

admin-tools/merge-for-3.6.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+PYTHON_VERSION=3.1
+
+# FIXME put some of the below in a common routine
+function checkout_version {
+    local repo=$1
+    version=${2:-python-3.0-to-3.2}
+    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
+python3_trepan_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
+
+mydir=$(dirname $bs)
+fulldir=$(readlink -f $mydir)
+(cd $fulldir/.. && \
+     checkout_version python-spark master && \
+     checkout_version python-xdis && \
+     checkout_version python-filecache python-3.1-to-3.2 && \
+     checkout_version pycolumnize python-3.0-to-3.5 && \
+     checkout_version python-uncompyle6 \
+    )
+cd $owd
+rm -v */.python-version || true
+
+git checkout python-3.0-to-3.1 && pyenv local $PYTHON_VERSION && git pull
+cd $python3_trepan_owd