gregcusack
diff --git a/‎.github/workflows/ci.yml
Lines changed: 13 additions & 2 deletions b/‎.github/workflows/ci.yml
Lines changed: 13 additions & 2 deletions
diff --git a/‎README.rst
Lines changed: 1 addition & 2 deletions b/‎README.rst
Lines changed: 1 addition & 2 deletions
diff --git a/‎ci.sh
Lines changed: 35 additions & 1 deletion b/‎ci.sh
Lines changed: 35 additions & 1 deletion
@@ -8,7 +8,7 @@ on:
 
 jobs:
   Ubuntu:
-    name: 'Ubuntu (${{ matrix.python }})'
+    name: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})'
     timeout-minutes: 10
     runs-on: 'ubuntu-latest'
     strategy:
@@ -20,6 +20,16 @@ jobs:
           - '3.8'
           - '3.9'
           - '3.10'
+          - 'pypy-3.7'
+          - 'pypy-3.8'
+        check_lint: ['0']
+        extra_name: ['']
+        include:
+          - python: '2.7'
+            extra_name: ', build only'
+          - python: '3.9'
+            check_lint: '1'
+            extra_name: ', check lint'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -30,5 +40,6 @@ jobs:
       - name: Run tests
         run: ./ci.sh
         env:
+          CHECK_LINT: '${{ matrix.check_lint }}'
           # Should match 'name:' up above
-          JOB_NAME: 'Ubuntu (${{ matrix.python }})'
+          JOB_NAME: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})'
@@ -82,12 +82,11 @@ From source
 
 To install from source::
 
+    pip install cython
     git clone https://github.com/oremanj/python-netfilterqueue
     cd python-netfilterqueue
     pip install .
 
-If Cython is installed, Distutils will use it to regenerate the .c source from the .pyx. It will then compile the .c into a .so.
-
 API
 ===
 
 
@@ -4,9 +4,43 @@ set -ex -o pipefail
 
 pip install -U pip setuptools wheel
 sudo apt-get install libnetfilter-queue-dev
+
 python setup.py sdist --formats=zip
 pip install dist/*.zip
-pip install -r test-requirements.txt
+
+if python --version 2>&1 | fgrep -q "Python 2.7"; then
+    # The testsuite doesn't run on 2.7, so do just a basic smoke test.
+    unshare -Urn python -c "from netfilterqueue import NetfilterQueue as NFQ; NFQ()"
+    exit $?
+fi
+
+pip install -Ur test-requirements.txt
+
+if [ "$CHECK_LINT" = "1" ]; then
+    error=0
+    if ! black --check setup.py tests; then
+        cat <<EOF
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+Formatting problems were found (listed above). To fix them, run
+
+   pip install -r test-requirements.txt
+   black setup.py tests
+
+in your local checkout.
+
+EOF
+        error=1
+    fi
+    if [ "$error" = "1" ]; then
+        cat <<EOF
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOF
+    fi
+    exit $error
+fi
 
 cd tests
 pytest -W error -ra -v .