Update CI suite

Author: codingjoe

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 jobs:
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.x"
       - run: python -m pip install --upgrade pip setuptools wheel twine readme-renderer
       - run: python setup.py sdist bdist_wheel
       - run: python -m twine check dist/*
@@ -35,12 +35,11 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
-      - run: python -m pip install -U setuptools wheel
       - run: sudo apt-get install -y gettext graphviz
-      - run: python setup.py develop
-      - run: python setup.py build_sphinx -W -b doctest -b html
+      - run: python -m pip install -e .[docs]
+      - run: python -m sphinx -W -b doctest -b html docs docs/_build
 
-  pytest:
+  PyTest:
     needs:
       - standardjs
     strategy:
@@ -55,25 +54,36 @@ jobs:
           - "4.1"
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+      - run: python -m pip install Django~="${{ matrix.django-version }}.0"
+      - run: python -m pip install -e .[test]
+      - run: python -m pytest
+      - uses: codecov/codecov-action@v2
+
+  Selenium:
+    needs:
+      - standardjs
+    strategy:
+      matrix:
+        python-version:
+          - "3.x"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
       - name: Install Chrome
         run: sudo apt-get install -y google-chrome-stable
       - name: Install Selenium
         run: |
           mkdir bin
           curl -O https://chromedriver.storage.googleapis.com/`curl -s https://chromedriver.storage.googleapis.com/LATEST_RELEASE`/chromedriver_linux64.zip
           unzip chromedriver_linux64.zip -d bin
-      - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip setuptools wheel codecov
-          pip install -e .[test]
-          pip install django~="${{ matrix.django-version }}.0"
-      - name: Run tests
-        run: PATH=$PATH:$(pwd)/bin pytest
-      - run: codecov
-        env:
-          CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - run: python -m pip install Django
+      - run: python -m pip install -e .[test,selenium]
+      - run: python -m pytest
+      - uses: codecov/codecov-action@v2

.github/workflows/release.yml

@@ -11,13 +11,11 @@ jobs:
       - 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
+          python-version: "3.x"
+      - run: python -m pip install --upgrade pip build wheel twine
       - name: Build dist packages
-        run: python setup.py sdist bdist_wheel
-      - name: Upload packages
-        run: python -m twine upload dist/*
+        run: python -m build --sdist --wheel
+      - run: python -m twine upload dist/*
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
@@ -29,7 +27,7 @@ jobs:
       - uses: actions/setup-node@v3.4.1
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.x"
       - run: python set_version.py
       - name: Upload packages
         run: npm publish

setup.cfg

@@ -32,20 +32,15 @@ install_requires =
     django-appconf>=0.6.0
 setup_requires =
     setuptools_scm
-    sphinx
-    pytest-runner
-tests_require =
-    pytest
-    pytest-cov
-    pytest-django
-    selenium
 
 [options.extras_require]
 test =
     pytest
     pytest-cov
     pytest-django
     selenium
+selenium =
+    selenium
 docs =
     sphinx