Simplify tox, cleanup pyproject.toml, add coverage to test (#911)

.github/workflows/test.yml

@@ -64,7 +64,6 @@ jobs:
       - run: python -m pip install -e .
       - run: coverage run manage.py test
       - run: python -m pip install -U coveralls
-      - run: coverage combine
       - name: Upload coveralls (parallel)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -2,7 +2,8 @@ VERSION := $(shell python -c "import bootstrap3;print(bootstrap3.__version__)")
 
 .PHONY: test
 test:
-	python manage.py test
+	coverage run manage.py test
+	coverage report
 
 .PHONY: tests
 tests:

docs/conf.py

@@ -3,18 +3,12 @@
 
 import tomllib
 
+module = importlib.import_module('bootstrap3')
+
 with open("../pyproject.toml", "rb") as f:
     pyproject = tomllib.load(f)
 
 project = pyproject["project"]["name"]
-conf = {"module": project.replace("-", "_")}
-
-try:
-    conf.update(pyproject["tool"]["sphinx"]["x-conf"])
-except KeyError:
-    pass
-
-module = importlib.import_module(conf["module"])
 release = module.__version__
 version = ".".join(release.split(".")[:2])
 author = ", ".join(author["name"] for author in pyproject["project"]["authors"])

pyproject.toml

@@ -77,15 +77,11 @@ known-third-party = ["django"]
 
 [tool.coverage.run]
 branch = true
-parallel = true
-source = ["src"]
+source = ["src", "tests"]
 
 [tool.coverage.paths]
 package = ["src/bootstrap3", "*/django_bootstrap3/src/bootstrap3"]
 
 [tool.coverage.report]
 show_missing = true
 skip_covered = true
-
-[tool.sphinx.x-conf]
-module = "bootstrap3"

tox.ini

@@ -23,17 +23,22 @@ setenv =
     PYTHONPATH={toxinidir}
     PYTHONWARNINGS=all
 commands =
-    coverage run --source=src manage.py test {posargs}
+    python manage.py test {posargs}
 deps =
     3.2: Django==3.2.*
     4.0: Django==4.0.*
     4.1: Django==4.1.*
     4.2: Django==4.2.*
     5.0: Django==5.0.*
     main: https://github.com/django/django/archive/main.tar.gz
-    coverage
     -r{toxinidir}/requirements-test.txt
 
+[testenv:ruff]
+basepython = python3.11
+allowlist_externals = ruff
+deps = ruff
+commands = ruff .
+
 [testenv:docs]
 basepython = python3.11
 allowlist_externals = make
@@ -43,9 +48,3 @@ commands =
     make docs
 deps =
     -r{toxinidir}/docs/requirements.txt
-
-[testenv:lint]
-basepython = python3.11
-allowlist_externals = ruff
-deps = ruff
-commands = ruff .