minor packaging fixes and bump to 0.4.21

archivebox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: archivebox
-Version: 0.4.21
+Version: 0.4.22
 Summary: The self-hosted internet archive.
 Home-page: https://github.com/ArchiveBox/ArchiveBox
 Author: Nick Sweeting

archivebox.egg-info/requires.txt

@@ -1,25 +1,25 @@
-requests==2.24.0
 atomicwrites==1.4.0
-mypy-extensions==0.4.3
-base32-crockford==0.3.0
-django==3.0.8
-django-extensions==3.0.3
-dateparser
-ipython
-youtube-dl
-python-crontab==2.5.1
 croniter==0.3.34
+dateparser
+django-extensions==3.0.3
+django==3.0.8
+ipython
+mypy-extensions==0.4.3
+python-crontab==2.5.1
+requests==2.24.0
 w3lib==1.22.0
+youtube-dl
 
 [dev]
-setuptools
-twine
+bottle
+django-stubs
 flake8
 ipdb
 mypy
-django-stubs
+pytest
+recommonmark
+setuptools
 sphinx
 sphinx-rtd-theme
-recommonmark
-pytest
-bottle
+stdeb
+twine

archivebox/base32_crockford.py

@@ -37,9 +37,9 @@ __all__ = ["encode", "decode", "normalize"]
 
 
 if PY3:
-    string_types = str,
+    string_types = (str,)
 else:
-    string_types = basestring,
+    string_types = (basestring,)  # noqa
 
 # The encoded symbol space does not include I, L, O or U
 symbols = '0123456789ABCDEFGHJKMNPQRSTVWXYZ'

bin/build.sh

@@ -14,6 +14,8 @@ REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && p
 
 cd "$REPO_DIR"
 
+# pipenv install --dev
+
 ./bin/build_docs.sh
 ./bin/build_pip.sh
 ./bin/build_deb.sh

bin/release.sh

@@ -12,9 +12,8 @@ IFS=$'\n'
 
 REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
 
-source "$REPO_DIR/.venv/bin/activate"
 cd "$REPO_DIR"
-
+source "./.venv/bin/activate"
 
 
 # Make sure git is clean
@@ -66,7 +65,7 @@ echo "[^] Uploading to pypi.org"
 python3 -m twine upload --repository pypi dist/*
 
 echo "[^] Uploading to launchpad.net"
-python3 -m dput archivebox "deb_dist/archivebox_${NEW_VERSION}-1_source.changes"
+dput archivebox "deb_dist/archivebox_${NEW_VERSION}-1_source.changes"
 
 echo "[^] Uploading docker image"
 # docker login --username=nikisweeting