replace setup.py

Author: escattone

setup.cfg .bumpversion.cfgsetup.cfg renamed to .bumpversion.cfg

@@ -4,10 +4,3 @@ commit = True
 tag = False
 
 [bumpversion:file:mozilla_django_oidc/__init__.py]
-
-[wheel]
-universal = 1
-
-[flake8]
-max-line-length = 99
-exclude = docs,build

.circleci/config.yml

@@ -5,6 +5,14 @@ common_steps: &common_steps
     - checkout
     - attach_workspace:
         at: /tmp/workspace
+    - run:
+        name: Install geckodriver
+        command: |
+          apt-get update && apt-get install -y wget tar
+          GECKODRIVER_VERSION="v0.34.0"
+          wget "https://github.com/mozilla/geckodriver/releases/download/${GECKODRIVER_VERSION}/geckodriver-${GECKODRIVER_VERSION}-linux64.tar.gz"
+          tar -xvzf "geckodriver-${GECKODRIVER_VERSION}-linux64.tar.gz"
+          mv geckodriver /usr/local/bin/
     - run:
         name: Setup testrp /etc/hosts
         command: echo 127.0.0.1 testrp | tee -a /etc/hosts
@@ -45,8 +53,9 @@ jobs:
     steps:
       - checkout
       - run: mkdir workspace
+      - run: pip install '.[dev]'
       - run: make sdist
-      - run: mv dist/mozilla-django-oidc-* workspace/mozilla-django-oidc-dev.tar.gz
+      - run: mv dist/mozilla_django_oidc-* workspace/mozilla-django-oidc-dev.tar.gz
       - persist_to_workspace:
           root: workspace
           paths:

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 99
+exclude = docs,build

CONTRIBUTING.rst

@@ -62,11 +62,14 @@ Ready to contribute? Here's how to set up `mozilla-django-oidc` for local develo
 
        $ git clone git@github.com:your_name_here/mozilla-django-oidc.git
 
-3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::
+3. Create a virtual environment and install the package with its
+   development dependencies. This command will install all the tools
+   needed for testing and linting::
 
-       $ mkvirtualenv mozilla-django-oidc
        $ cd mozilla-django-oidc/
-       $ python setup.py develop
+       $ python -m venv .venv
+       $ source .venv/bin/activate  # On Windows use `.venv\Scripts\activate`
+       $ pip install -e .[dev]
 
 4. Create a branch for local development::
 
@@ -78,7 +81,7 @@ Ready to contribute? Here's how to set up `mozilla-django-oidc` for local develo
    tests, including testing other Python versions with tox::
 
        $ flake8 mozilla_django_oidc tests
-       $ python setup.py test
+       $ DJANGO_SETTINGS_MODULE=tests.settings python -m django test
        $ tox
 
    To get flake8 and tox, just pip install them into your virtualenv.
@@ -106,9 +109,9 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 3.6+ and for PyPy. Check
-   `<https://github.com/mozilla/mozilla-django-oidc/actions>`_
-   and make sure that the tests pass for all supported Python versions.
+3. The pull request should work for Python 3.8+. Check
+   `<https://github.com/mozilla/mozilla-django-oidc/actions>`_ and make sure
+   that the tests pass for all supported Python versions.
 
 Tips
 ----
@@ -120,14 +123,14 @@ We use tox to run tests::
 
 To run a specific environment, use the ``-e`` argument::
 
-    $ tox -e py27-django111
+    $ tox -e py312-django420
 
 
 You can also run the tests in a virtual environment without tox::
 
-    $ DJANGO_SETTINGS_MODULE=tests.settings django-admin test
+    $ DJANGO_SETTINGS_MODULE=tests.settings python -m django test
 
 
 You can specify test modules to run rather than the whole suite::
 
-    $ DJANGO_SETTINGS_MODULE=tests.settings django-admin test tests.test_views
+    $ DJANGO_SETTINGS_MODULE=tests.settings python -m django test tests.test_views

MANIFEST.in

@@ -3,4 +3,8 @@ include CONTRIBUTING.rst
 include HISTORY.rst
 include LICENSE
 include README.rst
-recursive-include mozilla_django_oidc *.html *.png *.gif *js *.css *jpg *jpeg *svg *py
+
+include .flake8
+include .bumpversion.cfg
+recursive-include docs *
+recursive-include integration_tests *

Makefile

@@ -15,18 +15,19 @@ clean-pyc: ## remove Python file artifacts
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
+	find . -name '__pycache__' -exec rm -rf {} +
 
 lint: ## check style with flake8
 	flake8 mozilla_django_oidc tests
 
 test: ## run tests quickly with the default Python
-	DJANGO_SETTINGS_MODULE=tests.settings django-admin test
+	DJANGO_SETTINGS_MODULE=tests.settings python -m django test
 
 test-all: ## run tests on every Python version with tox
 	tox
 
 coverage: ## check code coverage quickly with the default Python
-	DJANGO_SETTINGS_MODULE=tests.settings coverage run --source mozilla_django_oidc  `which django-admin` test
+	coverage run --source mozilla_django_oidc -m django test --settings=tests.settings
 	coverage report -m
 	coverage html
 	open htmlcov/index.html
@@ -37,10 +38,13 @@ docs: ## generate Sphinx HTML documentation, including API docs
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs html
 
-release: clean ## package and upload a release
-	python setup.py sdist upload
-	python setup.py bdist_wheel upload
+build: clean ## build the sdist and wheel
+	python -m build . --sdist --wheel
+	ls -l dist
+
+release: build ##package and upload a release
+	twine upload dist/*
 
 sdist: clean ## package
-	python setup.py sdist
+	python -m build . --sdist
 	ls -l dist

pyproject.toml

@@ -0,0 +1,89 @@
+[build-system]
+requires = [
+    "setuptools>=61.0.0",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "mozilla-django-oidc"
+dynamic = ["version", "readme"]
+description = "A lightweight authentication and access management library for integration with OpenID Connect enabled authentication services."
+authors = [
+    { name = "Tasos Katsoulas", email = "akatsoulas@mozilla.com" },
+    { name = "John Giannelos", email = "jgiannelos@mozilla.com" }
+]
+license = { text = "MPL-2.0" }
+keywords = ["mozilla-django-oidc"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Framework :: Django",
+    "Framework :: Django :: 3.2",
+    "Framework :: Django :: 4.2",
+    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
+    "Intended Audience :: Developers",
+    "Operating System :: MacOS",
+    "Operating System :: POSIX :: Linux",
+    "Natural Language :: English",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+
+dependencies = [
+    "Django >= 3.2",
+    "pyjwt",
+    "requests",
+    "cryptography",
+]
+
+[project.urls]
+Homepage = "https://github.com/mozilla/mozilla-django-oidc"
+Documentation = "https://mozilla-django-oidc.readthedocs.io"
+Changelog = "https://github.com/mozilla/mozilla-django-oidc/releases"
+
+[project.optional-dependencies]
+drf = [
+    "djangorestframework>=3.14",
+]
+test = [
+    "bumpversion",
+    "ipython",
+    "ipdb",
+    "djangorestframework>=3.14",
+    "pre-commit",
+    "responses",
+    "importlib-metadata; python_version < '3.10'",
+    "coverage",
+    "tox",
+]
+lint = [
+    "flake8",
+]
+build = [
+    "build",
+]
+docs = [
+    "sphinx",
+    "sphinx_rtd_theme",
+    "readthedocs-sphinx-search",
+]
+dev = [
+    "mozilla-django-oidc[test,docs,drf,lint,build]",
+]
+
+[tool.setuptools]
+include-package-data = true
+zip-safe = false
+
+[tool.setuptools.dynamic]
+version = { attr = "mozilla_django_oidc.__version__" }
+readme = { file = ["README.rst"], "content-type" = "text/x-rst" }
+
+[tool.setuptools.packages.find]
+include = ["mozilla_django_oidc", "mozilla_django_oidc.*"]
+exclude = ["build*", "dist*", "*.egg-info*"]