Update CI suite

Author: codingjoe

.github/workflows/ci.yml

@@ -8,43 +8,53 @@ on:
 
 jobs:
 
-  black:
+  lint:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        lint-command:
+          - bandit -r . -x ./tests
+          - black --check --diff .
+          - flake8 .
+          - isort --check-only --diff .
+          - pydocstyle .
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
-      - run: python -m pip install black
-      - run: black --check --diff .
+          python-version: "3.x"
+          cache: 'pip'
+          cache-dependency-path: 'linter-requirements.txt'
+      - run: python -m pip install -r linter-requirements.txt
+      - run: ${{ matrix.lint-command }}
 
   docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
-      with:
-        python-version: "3.10"
-    - run: sudo apt install -y python3-enchant graphviz
-    - run: python -m pip install --upgrade pip setuptools
-    - run: pip install sphinxcontrib-spelling
-    - run: pip install -e '.[docs]'
-    - run: python setup.py build_sphinx -W -b spelling
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+      - run: sudo apt install -y python3-enchant graphviz
+      - run: python -m pip install sphinxcontrib-spelling
+      - run: python -m pip install -e '.[docs]'
+      - run: python -m sphinx -W -b spelling docs docs/_build
 
   dist:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
-      - run: python -m pip install --upgrade pip setuptools wheel twine readme-renderer
-      - run: python setup.py sdist bdist_wheel
+          python-version: "3.x"
+      - run: python -m pip install --upgrade pip build wheel twine readme-renderer
+      - run: python -m build --sdist --wheel
       - run: python -m twine check dist/*
 
-  pytest:
+  PyTest:
     needs:
       - dist
+      - lint
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -53,38 +63,28 @@ jobs:
           - "3.9"
           - "3.10"
         django-version:
-          - "2.2a"
-          - "3.2a"
-          - "4.0a"
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-    - run: sudo apt install -y graphviz redis-server
-    - run: python -m pip install --upgrade pip setuptools wheel codecov
-    - run: python -m pip install -e .[dramatiq]
-    - run: python -m pip install "django~=${{ matrix.django-version }}"
-    - run: python setup.py test
-    - run: codecov
-
-  extras:
-    needs:
-      - dist
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
+          - "2.2"
+          - "3.2"
+          - "4.0"
         extras:
-          - dramatiq
-          - celery
-          - dramatiq,reversion
+          - "test"
+        include:
+          - python-version: "3.x"
+            django-version: "4.0"
+            extras: "test,dramatiq"
+          - python-version: "3.x"
+            django-version: "4.0"
+            extras: "test,celery"
+          - python-version: "3.x"
+            django-version: "4.0"
+            extras: "test,reversion"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
-      - run: sudo apt-get install -y graphviz redis-server
-      - run: python -m pip install --upgrade pip setuptools wheel codecov
+          python-version: ${{ matrix.python-version }}
+      - run: sudo apt install -y graphviz redis-server
+      - run: python -m pip install "django==${{ matrix.django-version }}.*"
       - run: python -m pip install -e .[${{ matrix.extras }}]
-      - run: python setup.py test
-      - run: codecov
+      - run: python -m pytest
+      - uses: codecov/codecov-action@v2

.github/workflows/release.yml

@@ -5,19 +5,17 @@ on:
     types: [published]
 
 jobs:
-  PyPI:
+
+  PyPi:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
-      - name: Install Python dependencies
-        run: python -m pip install --upgrade pip setuptools wheel twine
-      - name: Build dist packages
-        run: python setup.py sdist bdist_wheel
-      - name: Upload packages
-        run: python -m twine upload dist/*
+          python-version: "3.x"
+      - run: python -m pip install --upgrade pip build wheel twine
+      - run: python -m build --sdist --wheel
+      - run: python -m twine upload dist/*
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}

linter-requirements.txt

@@ -0,0 +1,5 @@
+bandit==1.7.4
+black==22.8.0
+flake8==5.0.4
+isort==5.10.1
+pydocstyle[toml]==6.1.1

setup.cfg

@@ -42,6 +42,7 @@ keywords =
     task
 
 [options]
+python_requires = >=3.7
 include_package_data = True
 packages = joeflow
 install_requires =
@@ -60,19 +61,25 @@ tests_require =
     redis
 
 [options.extras_require]
+test =
+    pytest
+    pytest-cov
+    pytest-django
+    pytest-env
+    redis
+docs =
+    celery>=4.2.0
+    django-reversion
+    dramatiq
+    django_dramatiq
+    redis
 reversion =
     django-reversion
 celery =
     celery>=4.2.0
 dramatiq =
     dramatiq<=1.12.0
     django_dramatiq
-docs =
-    celery>=4.2.0
-    django-reversion
-    dramatiq
-    django_dramatiq
-    redis
 
 [bdist_wheel]
 universal = 1