First pass of refactoring using recent setuptools, typing and mypy.

Author: pascalbauermeister

build-testpypi.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+. ./set-ex.sh
+
+banner2 "Cleaning up"
+./clean.sh
+
+banner2 "Linting"
+./lint.sh
+
+banner2 "Testing"
+./test.sh
+
+banner2 "Making doc"
+./make-doc.sh

build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -ex
+
+clean() {
+    $1 rm -rf build/ dist/ src/*.egg-info/ $(find -name __pycache__)
+}
+
+clean || clean sudo

clean.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+. ./set-ex.sh
+
+WHAT=umlsequence2
+
+./build.sh
+
+yes | pip3 uninstall $WHAT 2>/dev/null || true
+yes | sudo pip3 uninstall $WHAT
+
+python3 setup.py build
+
+sudo python3 setup.py install

examples/example.svg

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -ex
+
+MYPY_OPTS=""
+MYPY_OPTS+=" --warn-redundant-casts"
+MYPY_OPTS+=" --warn-return-any"
+#MYPY_OPTS+=" --warn-unreachable"
+MYPY_OPTS+=" --strict-equality"
+MYPY_OPTS+=" --strict --namespace-packages"
+
+#SRCS=$(find src tests -name "*.py")
+SRCS=$(find src -name "*.py")
+mypy --ignore-missing-imports --pretty $MYPY_OPTS --no-strict-optional $SRCS

install-locally.py

@@ -0,0 +1,28 @@
+#!/bin/bash
+. ./set-ex.sh
+
+WHAT=umlsequence2
+
+#OPTS=--debug
+OPTS=
+
+for dir in doc examples; do (
+    cd $dir
+
+    rm -f *.svg
+
+    if ls *.md; then
+	for doc in *.md; do
+	    ../$WHAT $OPTS $doc --markdown
+	done
+    fi
+
+    if ls *.umlsequence; then
+	for doc in *.umlsequence; do
+	    ../$WHAT $OPTS $doc
+	done
+    fi
+)
+done
+
+./$WHAT README.md --markdown

lint.sh

@@ -10,12 +10,21 @@
 #   https://pypi.org/manage/account/token/
 #
 # Version info: please update the file
-#   setup.cfg
+#   setup.py
 #
 
-set -ex
+. ./set-ex.sh
 
-rm -rf dist/ src/*.egg-info/
-python3 -m build
+./build.sh
+
+
+banner2 "Publishing to Pypi"
+
+if [ ! -f .token ]; then
+    echo "ERROR: please have a file named '.token' containing your pypi token"
+    exit 1
+fi
+
+python3 setup.py sdist
 python3 -m twine upload --username __token__ dist/* \
 	--password $(cat .token) --verbose

make-doc.sh

@@ -1,7 +1,5 @@
 [build-system]
-requires = [
-    "setuptools>=42",
-    "wheel"
-]
+# These are the assumed default build requirements from pip:
+# https://pip.pypa.io/en/stable/reference/pip/#pep-517-and-518-support
+requires = ["setuptools>=43.0.0", "wheel"]
 build-backend = "setuptools.build_meta"
-

build-pypi.sh publish-to-pypi.shbuild-pypi.sh renamed to publish-to-pypi.sh

@@ -0,0 +1,43 @@
+# Make 'set -ex' no trace 'echo' (https://superuser.com/a/1141026)
+set +x -e
+
+shopt -s expand_aliases 2>/dev/null || true  # for bash
+
+_here_=$(pwd)
+
+alias echo='{ save_flags="$-"; set +x; } 2>/dev/null; _echo_';
+_echo_() { \echo "$*"; case "$save_flags" in *x*)  set -x;; esac }
+
+alias banner='{ save_flags="$-"; set +x; } 2>/dev/null; _banner_';
+_banner_() { __banner__ "$*"; case "$save_flags" in *x*)  set -x;; esac }
+
+alias banner2='{ save_flags="$-"; set +x; } 2>/dev/null; _banner2_';
+_banner2_() { __banner2__ "$*"; case "$save_flags" in *x*)  set -x;; esac }
+
+alias step='{ save_flags="$-"; set +x; } 2>/dev/null; _step_';
+_step_() { __step__ "$*"; case "$save_flags" in *x*)  set -x;; esac }
+
+__banner__() {
+    \echo
+    \echo "######################################################################"
+    \echo "$*"
+    \echo "######################################################################"
+    \echo
+}
+
+__banner2__() {
+    \echo
+    \echo "----------------------------------------------------------------------"
+    \echo "$*"
+    \echo "----------------------------------------------------------------------"
+    \echo
+}
+
+__step__() {
+    \echo
+    \echo "==== $* ===="
+    \echo
+}
+
+set -ex
+