Administrivia

admin-tools/check-older-versions.sh

@@ -12,6 +12,7 @@ fi
 if ! source ./setup-python-2.4.sh ; then
     exit $?
 fi
+
 cd ..
 for version in $PYVERSIONS; do
     if ! pyenv local $version ; then

admin-tools/make-dist-newer.sh

@@ -5,8 +5,11 @@ PACKAGE=uncompyle6
 function finish {
   cd $owd
 }
+owd=$(pwd)
+trap finish EXIT
+
 cd $(dirname ${BASH_SOURCE[0]})
-if ! source ./pyenv-older-versions ; then
+if ! source ./pyenv-newer-versions ; then
     exit $?
 fi
 if ! source ./setup-master.sh ; then
@@ -18,7 +21,13 @@ source $PACKAGE/version.py
 echo $VERSION
 
 for pyversion in $PYVERSIONS; do
-    # Pick out first two numbers
+    if ! pyenv local $pyversion ; then
+	exit $?
+    fi
+    # pip bdist_egg create too-general wheels. So
+    # we narrow that by moving the generated wheel.
+
+    # Pick out first two number of version, e.g. 3.5.1 -> 35 
     first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//')
     rm -fr build
     python setup.py bdist_egg bdist_wheel

admin-tools/make-dist-older.sh

@@ -5,6 +5,8 @@ PACKAGE=uncompyle6
 function finish {
   cd $owd
 }
+owd=$(pwd)
+trap finish EXIT
 
 cd $(dirname ${BASH_SOURCE[0]})
 if ! source ./pyenv-older-versions ; then
@@ -18,13 +20,15 @@ source ../$PACKAGE/version.py
 echo $VERSION
 
 for pyversion in $PYVERSIONS; do
-    # Pick out first two numbers
-    first_two=$(echo $pyversion | cut -d'.' -f 1-2 | sed -e 's/\.//')
+    if ! pyenv local $pyversion ; then
+	exit $?
+    fi
+
     rm -fr build
     python setup.py bdist_egg
 done
 
-# Pypi can only have one source taball.
+# Pypi can only have one source tarball.
 # Tarballs can get created from the above setup, so make sure to remove them since we want
 # the tarball from master.
 

admin-tools/pyenv-newer-versions

@@ -1,5 +1,6 @@
+# -*- shell-script -*-
 if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
-export PYVERSIONS='3.5.2 3.6.2 2.6.9 3.3.6 pypy-5.0.1 2.7.13 3.4.2'
+export PYVERSIONS='3.5.2 3.6.2 2.6.9 3.3.6 2.7.13 3.4.2'

admin-tools/pyenv-older-versions

@@ -1,3 +1,4 @@
+# -*- shell-script -*-
 if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1

admin-tools/setup-master.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 PYTHON_VERSION=3.6.3
 
+# FIXME put some of the below in a common routine
+function finish {
+  cd $owd
+}
+
+export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 owd=$(pwd)
 bs=${BASH_SOURCE[0]}
 if [[ $0 == $bs ]] ; then