untox

Author: kalekseev

.github/workflows/main.yml

@@ -14,10 +14,21 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     timeout-minutes: 10
+    env:
+      PYTHONPATH: "."
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", 3.11-dev]
-
+        # https://github.com/actions/python-versions/blob/main/versions-manifest.json
+        python-version: [3.8, 3.9, "3.10", 3.11.0-beta.5]
+        django-version:
+          - "Django>=3.2,<4.0"
+          - "Django>=4.0,<4.1"
+          - "Django>=4.1,<4.2"
+          - "https://github.com/django/django/archive/main.tar.gz"
+        include:
+          - drf: djangorestframework
+            python-version: "3.10"
+            django-version: "Django<4.2,>=4.1" # must be different from django-version
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -30,14 +41,33 @@ jobs:
         if: endsWith(matrix.python-version, '-dev')
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install Tox
-        run: python -m pip install tox tox-gh-actions
-      - name: Run Tox
-        run: python -m tox
+      - name: Install deps
+        run: |
+          python -m pip install -e .[test]
+          python -m pip install "${{ matrix.django-version }}" ${{ matrix.drf }}
+      - run: pytest
+
+  lint:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    env:
+      PYTHONPATH: "."
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+          cache: 'pip'
+          cache-dependency-path: 'setup.cfg'
+      - uses: actions/cache@v3
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - run: python -m pip install -e .[dev]
+      - run: pre-commit run --show-diff-on-failure --color=always --all-files
 
   package:
     runs-on: ubuntu-latest
-    needs: tests
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v3
@@ -62,7 +92,7 @@ jobs:
 
   publish:
     runs-on: ubuntu-latest
-    needs: [tests, package]
+    needs: [package, tests, lint]
     if: startsWith(github.ref, 'refs/tags/v')
     timeout-minutes: 5
     steps:
@@ -113,4 +143,4 @@ jobs:
           release_name: Release ${{ steps.release_output.outputs.VERSION }}
           body: ${{ steps.release_output.outputs.BODY }}
           draft: false
-          prerelease: false
+          prerelease: ${{ contains(steps.release_output.outputs.VERSION, 'rc') || contains(steps.release_output.outputs.VERSION, 'b') || contains(steps.release_output.outputs.VERSION, 'b') }}

.pre-commit-config.yaml

@@ -4,39 +4,56 @@ repos:
     hooks:
       - id: seed-isort-config
 
-  -   repo: https://github.com/pre-commit/mirrors-isort
-      rev: v5.10.1
-      hooks:
-      -   id: isort
+  - repo: https://github.com/pre-commit/mirrors-isort
+    rev: v5.10.1
+    hooks:
+      - id: isort
 
   - repo: https://github.com/asottile/pyupgrade
     rev: v2.37.3
     hooks:
       - id: pyupgrade
         args: ["--py36-plus"]
 
-  -   repo: https://github.com/psf/black
-      rev: 22.6.0
-      hooks:
-      -   id: black
-          types: [python]
+  - repo: https://github.com/psf/black
+    rev: 22.6.0
+    hooks:
+      - id: black
+        types: [python]
 
-  -   repo: https://github.com/pycqa/flake8
-      rev: 5.0.4
-      hooks:
-      -   id: flake8
-          additional_dependencies:
-            [
-              "flake8-bugbear",
-            ]
+  - repo: https://github.com/pycqa/flake8
+    rev: 5.0.4
+    hooks:
+      - id: flake8
+        additional_dependencies: ["flake8-bugbear"]
 
-  -   repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.3.0
-      hooks:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: debug-statements
       - id: check-added-large-files
       - id: check-merge-conflict
       - id: mixed-line-ending
         args: ["--fix=lf"]
+
+  - repo: https://github.com/mgedmin/check-manifest
+    rev: "0.48"
+    hooks:
+      - id: check-manifest
+
+  - repo: local
+    hooks:
+      - id: mypy
+        name: mypy
+        language: system
+        entry: mypy
+        args: [src/extra_checks, tests]
+        pass_filenames: false
+      - id: django-check
+        name: django check
+        language: system
+        entry: env DJANGO_SETTINGS_MODULE=tests.settings django-admin
+        args: [check, --fail-level, CRITICAL]
+        pass_filenames: false

README.md

@@ -119,7 +119,7 @@ EXTRA_CHECKS = {
 
 ## Development
 
-Install dev deps in virtualenv `pip install -e .[dev]`.
+Install dev deps in virtualenv `pip install -e .[dev,test]`.
 
 ## Credits
 

setup.cfg

@@ -37,10 +37,12 @@ install_requires =
 where = src
 
 [options.extras_require]
-dev =
+test =
     pytest
     pytest-cov
     pytest-django
+
+dev =
     Django
     djangorestframework
     django-stubs
@@ -50,7 +52,6 @@ dev =
     pre-commit
     isort
     pdbpp
-    tox
     black
 
 [flake8]

shell.nix

@@ -1,16 +1,15 @@
-{ pkgs ? import <nixpkgs> { }, system ? builtins.currentSystem }:
-with pkgs;
+{ nixpkgs ? import <nixpkgs> { }, system ? builtins.currentSystem }:
 let
   devshellSrc = fetchTarball {
-    url = "https://github.com/numtide/devshell/archive/f87fb932740abe1c1b46f6edd8a36ade17881666.tar.gz";
-    sha256 = "10cimkql88h7jfjli89i8my8j5la91zm4c78djqlk22dqrxmm6bs";
+    url = "https://github.com/numtide/devshell/archive/f55e05c6d3bbe9acc7363bc8fc739518b2f02976.tar.gz";
+    sha256 = "0fv6jgwrcm04q224hd19inlvwaagp86175jykjdrsm7dh3gz0xp7";
   };
-  devshell = import devshellSrc { inherit system pkgs; };
+  devshell = import devshellSrc { inherit system nixpkgs; };
 in
 devshell.mkShell {
   name = "django-extra-checks";
   packages = [
-    python310
+    nixpkgs.python310
   ];
 
   env = [
@@ -37,7 +36,7 @@ devshell.mkShell {
     {
       help = "install dev deps";
       name = "app.install";
-      command = "pip install -U pip wheel && pip install -e .[dev] && pre-commit install";
+      command = "pip install -U pip wheel && pip install -e .[dev,test] && pre-commit install";
     }
     {
       help = "typecheck project";