feat: Adding django 4.2 (#29)

* feat: Adding django 4.2

* fix: Added missing django4.2 requirements

* ci: Remove site-packages from coverage paths

Author: marksweb

.github/workflows/main.yml

@@ -18,7 +18,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - 3.7
           - 3.8
           - 3.9
           - '3.10'

.github/workflows/publish-to-live-pypi.yml

@@ -9,10 +9,15 @@ jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to pypi
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/django-sys-indicator
+    permissions:
+      id-token: write
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python 3.10
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: '3.10'
 
@@ -33,7 +38,4 @@ jobs:
 
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
+      uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/publish-to-test-pypi.yml

@@ -9,10 +9,15 @@ jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to TestPyPI
     runs-on: ubuntu-latest
+    environment:
+      name: test
+      url: https://test.pypi.org/p/django-sys-indicator
+    permissions:
+      id-token: write
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python 3.10
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: '3.10'
 
@@ -32,9 +37,7 @@ jobs:
         .
 
     - name: Publish distribution 📦 to Test PyPI
-      uses: pypa/gh-action-pypi-publish@master
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        user: __token__
-        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        repository_url: https://test.pypi.org/legacy/
-        skip_existing: true
+        repository-url: https://test.pypi.org/legacy/
+        skip-existing: true

.pre-commit-config.yaml

@@ -20,23 +20,8 @@ repos:
       - id: django-upgrade
         args: [--target-version, "3.2"]
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: "v0.0.270"
     hooks:
-      - id: flake8
-        additional_dependencies:
-#          - flake8-broken-line
-          - flake8-bugbear
-          - flake8-builtins
-          - flake8-coding
-          - flake8-commas
-          - flake8-comprehensions
-          - flake8-eradicate
-          - flake8-quotes
-          - flake8-tidy-imports
-          - pep8-naming
-
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]

HISTORY.rst

@@ -2,6 +2,11 @@
 History
 =======
 
+2.1.0 (2023-06-30)
+------------------
+
+* Added support for django 4.2
+
 2.0.0 (2022-11-24)
 ------------------
 

pyproject.toml

@@ -2,19 +2,18 @@
 requires = ["setuptools >= 40.6.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
-[tool.isort]
-combine_as_imports = true
-include_trailing_comma = true
-known_django = "django"
-known_first_party = "django_sys_indicator"
-line_length = 119
-multi_line_output = 5
-sections = ["FUTURE","STDLIB","DJANGO","THIRDPARTY","FIRSTPARTY","LOCALFOLDER"]
-
 [tool.pytest.ini_options]
 addopts = """\
     --strict-config
     --strict-markers
     --ds=tests.settings
     """
 django_find_project = false
+
+[tool.ruff.per-file-ignores]
+"__init__.py" = [
+  "F401"  # unused-import
+]
+
+[tool.ruff.isort]
+combine-as-imports = true

requirements.txt

@@ -1,69 +1,54 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    pip-compile
 #
---trusted-host pypi.python.org
---trusted-host pypi.org
---trusted-host files.pythonhosted.org
-
-attrs==21.4.0
-    # via pytest
+build==0.10.0
+    # via pip-tools
 cfgv==3.3.1
     # via pre-commit
-click==8.0.3
+click==8.1.3
     # via pip-tools
-coverage[toml]==6.3.1
+coverage[toml]==7.2.7
     # via pytest-cov
-distlib==0.3.4
+distlib==0.3.6
     # via virtualenv
-filelock==3.4.2
+filelock==3.12.2
     # via virtualenv
-identify==2.4.9
+identify==2.5.24
     # via pre-commit
-iniconfig==1.1.1
+iniconfig==2.0.0
     # via pytest
-nodeenv==1.6.0
+nodeenv==1.8.0
     # via pre-commit
-packaging==21.3
-    # via pytest
-pep517==0.12.0
-    # via pip-tools
-pip-tools==6.5.1
+packaging==23.1
+    # via
+    #   build
+    #   pytest
+pip-tools==6.13.0
     # via -r requirements.in
-platformdirs==2.5.0
+platformdirs==3.8.0
     # via virtualenv
-pluggy==1.0.0
+pluggy==1.2.0
     # via pytest
-pre-commit==2.17.0
+pre-commit==3.3.3
     # via -r requirements.in
-py==1.11.0
-    # via pytest
-pyparsing==3.0.7
-    # via packaging
-pytest==7.0.1
+pyproject-hooks==1.0.0
+    # via build
+pytest==7.4.0
     # via
     #   pytest-cov
     #   pytest-django
-pytest-cov==3.0.0
+pytest-cov==4.1.0
     # via -r requirements.in
 pytest-django==4.5.2
     # via -r requirements.in
 pyyaml==6.0
     # via pre-commit
-six==1.16.0
-    # via virtualenv
-toml==0.10.2
-    # via pre-commit
-tomli==2.0.1
-    # via
-    #   coverage
-    #   pep517
-    #   pytest
-virtualenv==20.13.1
+virtualenv==20.23.1
     # via pre-commit
-wheel==0.37.1
+wheel==0.40.0
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/compile.py

@@ -77,3 +77,15 @@
         check=True,
         capture_output=True,
     )
+    subprocess.run(
+        [
+            "python3.11",
+            *common_args,
+            "-P",
+            "Django>=4.2,<4.3",
+            "-o",
+            "py311-django42.txt",
+        ],
+        check=True,
+        capture_output=True,
+    )

requirements/py310-django32.txt

@@ -1,13 +1,9 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
 #    requirements/compile.py
 #
---trusted-host pypi.python.org
---trusted-host pypi.org
---trusted-host files.pythonhosted.org
-
 asgiref==3.5.2 \
     --hash=sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4 \
     --hash=sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424
@@ -68,9 +64,9 @@ coverage==6.5.0 \
     --hash=sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84 \
     --hash=sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987
     # via -r requirements.in
-django==3.2.16 \
-    --hash=sha256:18ba8efa36b69cfcd4b670d0fa187c6fe7506596f0ababe580e16909bcdec121 \
-    --hash=sha256:3adc285124244724a394fa9b9839cc8cd116faf7d159554c43ecdaa8cdf0b94d
+django==3.2.19 \
+    --hash=sha256:031365bae96814da19c10706218c44dff3b654cc4de20a98bd2d29b9bde469f0 \
+    --hash=sha256:21cc991466245d659ab79cb01204f9515690f8dae00e5eabde307f14d24d4d7d
     # via -r requirements.in
 exceptiongroup==1.0.4 \
     --hash=sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828 \

requirements/py310-django40.txt

@@ -1,13 +1,9 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
 #    requirements/compile.py
 #
---trusted-host pypi.python.org
---trusted-host pypi.org
---trusted-host files.pythonhosted.org
-
 asgiref==3.5.2 \
     --hash=sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4 \
     --hash=sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424
@@ -68,9 +64,9 @@ coverage==6.5.0 \
     --hash=sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84 \
     --hash=sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987
     # via -r requirements.in
-django==4.0.8 \
-    --hash=sha256:07e6433f263c3839939cfabeb6d7557841e0419e47759a7b7d37f6d44d40adcb \
-    --hash=sha256:27cb08fa6458c1eff8b97c4c2d03774646fb26feeaa4587dca10c49e6d4fc6a3
+django==4.0.10 \
+    --hash=sha256:2c2f73c16b11cb272c6d5e3b063f0d1be06f378d8dc6005fbe8542565db659cc \
+    --hash=sha256:4496eb4f65071578b703fdc6e6f29302553c7440e3f77baf4cefa4a4e091fc3d
     # via -r requirements.in
 exceptiongroup==1.0.4 \
     --hash=sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828 \