Merge pull request #91 from maykinmedia/pyproject

Switch to `pyproject.toml`

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length=88
+exclude=env,.tox,doc

.github/workflows/ci.yml

@@ -72,8 +72,8 @@ jobs:
 
       - name: Build sdist and wheel
         run: |
-          pip install pip setuptools wheel --upgrade
-          python setup.py sdist bdist_wheel
+          pip install build --upgrade
+          python -m build
 
       - name: Publish a Python distribution to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1

pyproject.toml

@@ -0,0 +1,125 @@
+[build-system]
+requires = ["setuptools>=61.0.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "mozilla-django-oidc-db"
+version = "0.18.1"
+description = "A database-backed configuration for mozilla-django-oidc"
+authors = [
+    {name = "Maykin Media", email = "support@maykinmedia.nl"}
+]
+readme = "README.rst"
+license = {file = "LICENSE"}
+keywords = ["OIDC", "django", "database", "authentication"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Framework :: Django",
+    "Framework :: Django :: 4.2",
+    "Intended Audience :: Developers",
+    "Operating System :: Unix",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+requires-python = ">=3.10"
+dependencies = [
+    "django>=4.2",
+    "django-jsonform",
+    "django-solo",
+    "glom",
+    "mozilla-django-oidc>=3.0.0",
+    "typing-extensions>=4.0.0",
+]
+
+[project.urls]
+Homepage = "/~https://github.com/maykinmedia/mozilla-django-oidc-db"
+Documentation = "https://mozilla-django-oidc-db.readthedocs.io/en/latest/"
+"Bug Tracker" = "/~https://github.com/maykinmedia/mozilla-django-oidc-db/issues"
+"Source Code" = "/~https://github.com/maykinmedia/mozilla-django-oidc-db"
+Changelog = "/~https://github.com/maykinmedia/mozilla-django-oidc-db/blob/master/CHANGELOG.rst"
+
+[project.optional-dependencies]
+tests = [
+    "psycopg2",
+    "pytest",
+    "pytest-django",
+    "pytest-mock",
+    "pytest-recording",
+    "requests-mock",
+    "factory-boy",
+    "pyquery",
+    "tox",
+    "isort",
+    "black",
+    "flake8",
+]
+coverage = [
+    "pytest-cov",
+]
+docs = [
+    "sphinx",
+    "sphinx-rtd-theme",
+]
+release = [
+    "bump-my-version",
+    "twine",
+]
+
+[tool.setuptools.packages.find]
+include = ["mozilla_django_oidc_db*"]
+namespaces = false
+
+[tool.isort]
+profile = "black"
+combine_as_imports = true
+known_django = "django"
+known_first_party="mozilla_django_oidc_db"
+sections=["FUTURE", "STDLIB", "DJANGO", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
+skip = ["env", "node_modules", ".tox"]
+skip_glob = ["**/migrations/**"]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+DJANGO_SETTINGS_MODULE = "testapp.settings"
+markers = [
+    "oidcconfig: keyword arguments for the OIDC config",
+    "auth_request: additional configuration for the auth_request fixture",
+    "callback_request: additional configuration for the callback_request fixture",
+    "mock_backend_claims: claims to be returned by the mock backend fixture",
+]
+
+[tool.bumpversion]
+current_version = "0.18.1"
+files = [
+    {filename = "pyproject.toml"},
+    {filename = "README.rst"},
+    {filename = "docs/conf.py"},
+]
+
+[tool.coverage.run]
+branch = true
+source = [
+    "mozilla_django_oidc_db"
+]
+omit = [
+    # migrations run while django initializes the test db
+    "*/migrations/*",
+]
+
+[tool.coverage.report]
+exclude_also = [
+    "if (typing\\.)?TYPE_CHECKING:",
+    "@(typing\\.)?overload",
+    "class .*\\(.*Protocol.*\\):",
+    "@(abc\\.)?abstractmethod",
+    "raise NotImplementedError",
+    "\\.\\.\\.",
+    "pass",
+]
+omit = [
+    "*/migrations/*",
+]

tests/test_admin_form.py

@@ -85,7 +85,7 @@ class ExtendedOpenIDConnectConfigForm(OpenIDConnectConfigForm):
         # Define an extra field to derive from the configuration
         oidc_mapping = dict(
             **OpenIDConnectConfigForm.oidc_mapping,
-            **{"logout_endpoint": "end_session_endpoint"}
+            **{"logout_endpoint": "end_session_endpoint"},
         )
 
     form = ExtendedOpenIDConnectConfigForm(data=form_data)

tox.ini

@@ -33,7 +33,7 @@ passenv =
 setenv   =
     PYTHONPATH = {toxinidir}
 commands =
-  py.test tests \
+  pytest tests \
    --cov --cov-report xml:reports/coverage-{envname}.xml \
    {posargs}
 
@@ -56,6 +56,6 @@ extras =
     docs
     tests
 commands=
-    py.test check_sphinx.py -v \
+    pytest check_sphinx.py -v \
     --tb=auto \
     {posargs}