Be up to date with six

diff --git a/doc/install.rst b/doc/install.rst
index 7257589023c9b9b5e7204775ab5e406226f260f2..c327a80894f70d53454a1e4b6d6a51d54ee13213 100644 (file)
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -22,7 +22,7 @@ You could use pip (**no** OpenPGP authentication is performed!) with PyPI::
 
     $ cat > requirements.txt <<EOF
     pyderasn==8.2 --hash=sha256:TO-BE-FILLED
-    six==1.14.0 --hash=sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a
+    six==1.15.0 --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259
     EOF
     $ pip install --requirement requirements.txt
 

diff --git a/doc/pip-requirements.txt b/doc/pip-requirements.txt
index 3a3684bcc7c899dc0525dfc75995c0b6fa72ba2b..4368c6f6dc39843e89de6fb4ef8562eb64fb1068 100644 (file)
--- a/doc/pip-requirements.txt
+++ b/doc/pip-requirements.txt
@@ -10,7 +10,7 @@ MarkupSafe==1.1.1
 Pygments==2.5.2
 pytz==2019.3
 requests==2.22.0
-six==1.14.0
+six==1.15.0
 snowballstemmer==2.0.0
 Sphinx==1.6.7
 sphinxcontrib-websupport==1.2.0

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"
 
-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
 
@@ -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')
-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 {} \;

diff --git a/pip-requirements.txt b/pip-requirements.txt
index 4f507734c18c0db02b1ad8b592450c5955245999..2b7ec987d9e5f2232dfce154b186b980a3ec4163 100644 (file)
--- a/pip-requirements.txt
+++ b/pip-requirements.txt
@@ -1 +1 @@
-six~=1.14
+six~=1.15