From 1639665b24c8409ec4e4381744871a9ed9b2c3e4 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 27 Jan 2025 18:24:22 -0600 Subject: [PATCH 1/4] Support Django 5.2 --- .github/workflows/testing.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 3786e35..25ae369 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main jobs: linting: @@ -31,15 +31,16 @@ jobs: fail-fast: false matrix: python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13"] - django-version: [ "4.2", "5.0", "5.1"] + django-version: [ "4.2", "5.0", "5.1", "5.2"] drf-version: ["3.14", "3.15"] exclude: # Python 3.9 is incompatible with Django v5+ - django-version: 5.0 python-version: 3.9 - # Python 3.9 is incompatible with Django v5+ - django-version: 5.1 python-version: 3.9 + - django-version: 5.2 + python-version: 3.9 # Django 4.2 is incompatible with Python 3.13+ - django-version: 4.2 python-version: 3.13 @@ -62,7 +63,7 @@ jobs: if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' - run: | source .venv/bin/activate - pip install "Django~=${{ matrix.django-version }}.0" + pip install "Django~=${{ matrix.django-version }}.0a1" pip install "djangorestframework~=${{ matrix.drf-version }}.0" - name: Run tests run: | From 047aaea885e36d6226220f964acd0893780cf8f8 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 27 Jan 2025 18:27:51 -0600 Subject: [PATCH 2/4] Replace master with main for index.rst --- docs/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index d3dcc5c..ff325ec 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,8 +10,8 @@ ADFS Authentication for Django :target: https://pypi.python.org/pypi/django-auth-adfs#downloads .. image:: https://img.shields.io/pypi/djversions/django-auth-adfs.svg :target: https://pypi.python.org/pypi/django-auth-adfs -.. image:: https://codecov.io/github/snok/django-auth-adfs/coverage.svg?branch=master - :target: https://codecov.io/github/snok/django-auth-adfs?branch=master +.. image:: https://codecov.io/github/snok/django-auth-adfs/coverage.svg?branch=main + :target: https://codecov.io/github/snok/django-auth-adfs?branch=main A Django authentication backend for Microsoft ADFS and Azure AD From 4dcbbaacba909e1a55e0f5003ff12c3bb8500263 Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 27 Jan 2025 18:28:49 -0600 Subject: [PATCH 3/4] Update master with main in README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index ca1e7c0..07ed4d7 100644 --- a/README.rst +++ b/README.rst @@ -10,8 +10,8 @@ ADFS Authentication for Django :target: https://pypi.python.org/pypi/django-auth-adfs#downloads .. image:: https://img.shields.io/pypi/djversions/django-auth-adfs.svg :target: https://pypi.python.org/pypi/django-auth-adfs -.. image:: https://codecov.io/github/snok/django-auth-adfs/coverage.svg?branch=master - :target: https://codecov.io/github/snok/django-auth-adfs?branch=master +.. image:: https://codecov.io/github/snok/django-auth-adfs/coverage.svg?branch=main + :target: https://codecov.io/github/snok/django-auth-adfs?branch=main A Django authentication backend for Microsoft ADFS and Azure AD From 785700e2b0153e067034c627e66f21b6a3052a0a Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 27 Jan 2025 18:29:05 -0600 Subject: [PATCH 4/4] Update master to main for codecov workflow --- .github/workflows/codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 8e39374..9826c43 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main jobs: codecov: