Script cleanups

httpcore/__init__.py

@@ -38,5 +38,7 @@
     "ReadError",
     "WriteError",
     "CloseError",
+    "ProtocolError",
+    "ProxyError",
 ]
 __version__ = "0.8.4"

requirements.txt

@@ -14,12 +14,12 @@ twine
 wheel
 
 # Tests & Linting
+flake8
 pytest
 pytest-asyncio
 pytest-trio
 pytest-cov
 black
-autoflake
 mypy
 isort
 mitmproxy

scripts/build

@@ -1,7 +1,5 @@
 #!/bin/sh -e
 
-PYTHONPATH=.
-
 if [ -d 'venv' ] ; then
     PREFIX="venv/bin/"
 else

scripts/check

@@ -1,12 +1,16 @@
 #!/bin/sh -e
 
-export PREFIX=""
+PACKAGE="httpcore"
+
 if [ -d 'venv' ] ; then
-    export PREFIX="venv/bin/"
+    PREFIX="venv/bin/"
+else
+    PREFIX=""
 fi
-export SOURCE_FILES="httpcore tests"
 
 set -x
 
-${PREFIX}mypy --ignore-missing-imports httpcore
+${PREFIX}mypy --ignore-missing-imports ${PACKAGE}
+${PREFIX}flake8 --max-line-length 88 ${PACKAGE}
+${PREFIX}black --check --exclude '(httpcore/_sync|tests/sync_tests)/.*' --target-version=py37 ${PACKAGE} tests
 scripts/unasync --check

scripts/clean

@@ -1,14 +1,11 @@
 #!/bin/sh -e
 
-if [ -d 'dist' ] ; then
-    rm -r dist
-fi
-if [ -d 'site' ] ; then
-    rm -r site
-fi
-if [ -d 'htmlcov' ] ; then
-    rm -r htmlcov
-fi
-if [ -d 'httpcore.egg-info' ] ; then
-    rm -r httpcore.egg-info
-fi
+PACKAGE=httpcore
+
+rm -rf dist
+rm -rf site
+rm -rf htmlcov
+rm -rf *.egg-info
+
+find ${PACKAGE} -type f -name "*.py[co]" -delete
+find ${PACKAGE} -type f -name __pycache__ -delete

scripts/install

@@ -4,16 +4,14 @@
 [ "$1" = "-p" ] && PYTHON=$2 || PYTHON="python3"
 
 REQUIREMENTS="requirements.txt"
-VENV="venv"
 
 set -x
 
 if [ -z "$GITHUB_ACTIONS" ]; then
-    "$PYTHON" -m venv "$VENV"
-    PIP="$VENV/bin/pip"
+    "$PYTHON" -m venv venv
+    PIP="venv/bin/pip"
 else
     PIP="pip"
 fi
 
 "$PIP" install -r "$REQUIREMENTS"
-"$PIP" install -e .

scripts/lint

@@ -1,14 +1,14 @@
 #!/bin/sh -e
 
-export PREFIX=""
+PACKAGE="httpcore"
+
 if [ -d 'venv' ] ; then
-    export PREFIX="venv/bin/"
+    PREFIX="venv/bin/"
+else
+    PREFIX=""
 fi
-export SOURCE_FILES="httpcore tests"
 
 set -x
 
-${PREFIX}autoflake --in-place --recursive $SOURCE_FILES
-${PREFIX}isort --project=httpcore --recursive --apply $SOURCE_FILES
-${PREFIX}black --exclude 'httpcore/_sync/.*' --exclude 'tests/sync_tests/.*' --target-version=py36 $SOURCE_FILES
+${PREFIX}black --exclude '(httpcore/_sync|tests/sync_tests)/.*' --target-version=py37 ${PACKAGE} tests
 scripts/unasync

scripts/publish

@@ -1,7 +1,6 @@
 #!/bin/sh -e
 
 VERSION_FILE="httpcore/__init__.py"
-PYTHONPATH=.
 
 if [ -d 'venv' ] ; then
     PREFIX="venv/bin/"

scripts/test

@@ -1,8 +1,9 @@
 #!/bin/sh
 
-export PREFIX=""
 if [ -d 'venv' ] ; then
-    export PREFIX="venv/bin/"
+    PREFIX="venv/bin/"
+else
+    PREFIX=""
 fi
 
 if [ -z $GITHUB_ACTIONS ]; then

scripts/unasync

@@ -1,8 +1,9 @@
 #!/bin/sh -e
 
-export PREFIX=""
 if [ -d 'venv' ] ; then
-    export PREFIX="venv/bin/"
+    PREFIX="venv/bin/"
+else
+    PREFIX=""
 fi
 
 ${PREFIX}python unasync.py ${@}