Administrivia

Author: rocky

.pre-commit-config.yaml

@@ -3,22 +3,22 @@ PACKAGE=trepan3k
 
 # FIXME put some of the below in a common routine
 function finish {
-  cd $make_dist_32_owd
+  cd $make_dist_33_owd
 }
 
-make_trepan_dist_32_owd=$(pwd)
+make_trepan_dist_33_owd=$(pwd)
 trap finish EXIT
 
 cd $(dirname ${BASH_SOURCE[0]})
 
-if ! source ./pyenv-3.2-3.5-versions ; then
+if ! source ./pyenv-3.3-3.5-versions ; then
     exit $?
 fi
-if ! source ./setup-python-3.2.sh ; then
+if ! source ./setup-python-3.3.sh ; then
     exit $?
 fi
 
-. ./setup-python-3.2.sh
+. ./setup-python-3.3.sh
 
 cd ..
 source trepan/version.py
@@ -51,6 +51,6 @@ python ./setup.py sdist
 tarball=dist/${PACKAGE}-${__version__}.tar.gz
 
 if [[ -f $tarball ]]; then
-    mv -v $tarball dist/${PACKAGE}_32-${__version__}.tar.gz
+    mv -v $tarball dist/${PACKAGE}_33-${__version__}.tar.gz
 fi
 finish

admin-tools/make-dist-3.2-3.5.sh admin-tools/make-dist-3.3-3.5.shadmin-tools/make-dist-3.2-3.5.sh renamed to admin-tools/make-dist-3.3-3.5.sh

@@ -4,6 +4,6 @@ PYTHON_VERSION=3.1
 pyenv local $PYTHON_VERSION
 cd $(dirname ${BASH_SOURCE[0]})
 if . ./setup-python-3.0.sh; then
-    git merge python-3.2-to-3.5
+    git merge python-3.3-to-3.5
 fi
 cd $trepan_merge_30_owd

admin-tools/merge-for-3.0.sh

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

admin-tools/merge-for-3.2.sh admin-tools/merge-for-3.3.shadmin-tools/merge-for-3.2.sh renamed to admin-tools/merge-for-3.3.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
-PYTHON_VERSION=3.2.6
+PYTHON_VERSION=3.3
 
 # FIXME put some of the below in a common routine
 function checkout_version {
     local repo=$1
-    version=${2:-python-3.0-to-3.2}
+    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
@@ -22,14 +22,16 @@ fi
 mydir=$(dirname $bs)
 fulldir=$(readlink -f $mydir)
 (cd $fulldir/.. && \
-     checkout_version python-spark master && \
-     checkout_version python-xdis && \
-     checkout_version shell-term-background python-3.0-to-3.2 && \
-     checkout_version pycolumnize python-3.0-to-3.5 && \
-     checkout_version python-uncompyle6 python-3.0-to-3.2 \
+     checkout_version python-spark python-3.3-to-3.5 && \
+     checkout_version python-xdis python-3.3-to-3.5 && \
+     checkout_version python-filecache python-3.3-to-3.5 && \
+     checkout_version shell-term-background python-3.3-to-3.5 && \
+     checkout_version_trepan3k pytracer python-3.3-to-3.5 && \
+     checkout_version pycolumnize python-3.3-to-3.5 && \
+     checkout_version python-uncompyle6 python-3.3-to-3.5 \
     )
 
 cd $trepan3k_owd
 rm -v */.python-version 2>/dev/null || true
 
-git checkout python-3.2-to-3.5 && pyenv local $PYTHON_VERSION && git pull
+git checkout python-3.3-to-3.5 && pyenv local $PYTHON_VERSION && git pull