Merge pull request #125 from snok/fundament/poetry_and_pypi_action

Implements workflow to push to PyPI

.github/FUNDING.yml

@@ -1 +1 @@
-github: jobec
+github: [jobec, jonasks, sondrelg]

.github/workflows/publish_to_pypi.yml

@@ -0,0 +1,22 @@
+name: Publish django-auth-adfs to PyPI 📦
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build-and-publish:
+    name: Build and publish
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install poetry
+      uses: snok/[email protected]
+    - name: Build and publish
+      run: |
+        poetry config pypi-token.pypi ${{ secrets.pypi_password }}
+        poetry publish --build --no-interaction

CHANGELOG.rst

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+
+`1.4.0`_ - 2021-01-16
+---------------------
+
+**Features**
+* Added support for enterprice app SSO certificates #87
+* Added setting to disable user creation #96
+
+**Fixed**
+* Dependency compatibility for PyJWT 2.0 #120
+* Django 4.0 deprecation cleanup #
+* Fixed a bug where IntegrityError could occur if a users groups changed, and multiple requests were done quickly. #95
+
+
 `1.3.1`_ - 2019-11-06
 ---------------------
 

django_auth_adfs/__init__.py

@@ -4,4 +4,4 @@
 Adding imports here will break setup.py
 """
 
-__version__ = '1.3.1'
+__version__ = '1.4.0'

pyproject.toml

@@ -0,0 +1,54 @@
+[tool.poetry]
+name = 'django-auth-adfs'
+version = '1.4.0'  # Remember to also change __init__.py version
+description = 'A Django authentication backend for Microsoft ADFS and AzureAD'
+authors = ['Joris Beckers <[email protected]>']
+maintainers = ['Jonas Krüger Svensson <[email protected]>', 'Sondre Lillebø Gundersen <[email protected]>']
+license = 'BSD'
+homepage = 'https://github.com/snok/django-auth-adfs'
+repository = 'https://github.com/snok/django-auth-adfs'
+documentation = 'https://django-auth-adfs.readthedocs.io/en/latest'
+keywords = ['django', 'authentication', 'adfs', 'azure', 'ad', 'oauth2']
+readme = 'README.rst'
+classifiers=[
+    'Environment :: Web Environment',
+    'Framework :: Django :: 1.11',
+    'Framework :: Django :: 2.0',
+    'Framework :: Django :: 2.1',
+    'Framework :: Django :: 2.2',
+    'Framework :: Django :: 3.0',
+    'Framework :: Django :: 3.1',
+    'Intended Audience :: Developers',
+    'Intended Audience :: End Users/Desktop',
+    'Operating System :: OS Independent',
+    'License :: OSI Approved :: BSD License',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'Topic :: Internet :: WWW/HTTP',
+    'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+    'Topic :: Internet :: WWW/HTTP :: WSGI',
+    'Topic :: Software Development :: Libraries :: Application Frameworks',
+    'Topic :: Software Development :: Libraries :: Python Modules',
+    'Development Status :: 5 - Production/Stable',
+]
+include = ['CHANGELOG.rst']
+
+[tool.poetry.dependencies]
+python = '^3'
+django = ' ^3.0 ||^2.0 || ^1.1'
+requests = '^1 || ^2'
+cryptography = '^1.7 || ^2.0 || ^3.0'
+PyJWT = "^1.0.1 || ^2.0"
+
+[tool.poetry.dev-dependencies]
+responses = '*'
+mock = '*'
+coverage = '*'
+tox = '*'
+djangorestframework = '*'
+PyJWT = "^1.0.1"  # Even though PyJWT>=2 works for auth-adfs, the utils for our tests does not.

setup.cfg

@@ -1,5 +1,2 @@
 [flake8]
 max-line-length = 120
-
-[bdist_wheel]
-universal=1

tox.ini

@@ -9,6 +9,7 @@ deps =
     coverage
     mock
     responses
+    pyjwt==1.7.1
     django111: Django>=1.11,<1.12
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2