Be up to date with six

[pyderasn.git] / makedist.sh

diff --git a/makedist.sh b/makedist.sh
index da40c44be1d9dff9d1e536565d6739e079b4e4cd..f394883d2585d21dbe09e460f37a07d9f3ef18dc 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -13,9 +13,10 @@ echo pyderasn.py >> $tmp/includes
 echo setup.py >> $tmp/includes
 tar cfI - $tmp/includes | tar xfC - $tmp/pyderasn-"$release"
 
 echo setup.py >> $tmp/includes
 tar cfI - $tmp/includes | tar xfC - $tmp/pyderasn-"$release"
 

-PYTHONPATH="$tmp/pyderasn-$release" make -C $tmp/pyderasn-"$release"/doc
+PYTHONPATH="$tmp/pyderasn-$release" redo $tmp/pyderasn-"$release"/doc/build.log
+rm -r $tmp/pyderasn-"$release"/doc/.redo $tmp/pyderasn-"$release"/doc/build.log

 
 

-tar xvfC doc/download/six-1.14.0.tar.gz $tmp --include "*/*six.py"
+tar xvfC doc/download/six-1.15.0.tar.gz $tmp --include "*/*six.py"

 mv -v $tmp/six-*/six.py $tmp/pyderasn-"$release"
 mv -v $tmp/six-*/test_six.py $tmp/pyderasn-"$release"/tests
 
 mv -v $tmp/six-*/six.py $tmp/pyderasn-"$release"
 mv -v $tmp/six-*/test_six.py $tmp/pyderasn-"$release"/tests
 


@@ -23,7 +24,7 @@ tar xvfC doc/download/termcolor-1.1.0.tar.gz $tmp --include "*/termcolor.py"
 mv -v $tmp/termcolor-*/termcolor.py $tmp/pyderasn-"$release"
 
 pip_hash=$(pip hash dist/pyderasn-"$release".tar.gz | sed -n '$p')
 mv -v $tmp/termcolor-*/termcolor.py $tmp/pyderasn-"$release"
 
 pip_hash=$(pip hash dist/pyderasn-"$release".tar.gz | sed -n '$p')

-six_requirement="six==1.14.0 --hash=sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a"
+six_requirement="six==1.15.0 --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"

 
 cd $tmp
 find . -type d -exec chmod 755 {} \;
 
 cd $tmp
 find . -type d -exec chmod 755 {} \;