Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RE: Issue: License Update? #300 #306

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,10 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ]
python-version: [ "3.8", "3.9", "3.10", "3.11" ]
django-version: [ "3.2", "4.0", "4.1", "4.2"]
drf-version: [ "3.11", "3.12", "3.13" ]
exclude:
# Python 3.7 is incompatible with Django v4+
- django-version: 4.0
python-version: 3.7
- django-version: 4.1
python-version: 3.7
- django-version: 4.2
python-version: 3.7
# Python 3.11 is incompatible with Django <v4.1
- django-version: 3.2
python-version: 3.11
Expand Down
5 changes: 2 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
Copyright (c) 2016, Joris Beckers
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

- Redistributions of source code must retain the above copyright notice, this
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above copyright notice, this
2. Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

Expand Down
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Installation
Requirements
------------

* Python 3.5 and above
* Python 3.8 and above
* Django 1.11 and above

You will also need the following:
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ classifiers = [
'License :: OSI Approved :: BSD License',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
Expand All @@ -36,9 +35,9 @@ classifiers = [
]

[tool.poetry.dependencies]
python = '^3.7'
python = '^3.8'
django = [
{ version = '^3', python = '<=3.7' },
{ version = '^3', python = '<=3.8' },
{ version = '^3 || ^4', python = '>=3.8' },
]
requests = '^1 || ^2'
Expand Down
2 changes: 1 addition & 1 deletion tests/test_authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ def test_nonexisting_user(self):
from django_auth_adfs.config import django_settings
settings = deepcopy(django_settings)
settings.AUTH_ADFS["CREATE_NEW_USERS"] = False
with patch("django_auth_adfs.config.django_settings", settings),\
with patch("django_auth_adfs.config.django_settings", settings), \
patch("django_auth_adfs.backend.settings", Settings()):
backend = AdfsAuthCodeBackend()
self.assertRaises(PermissionDenied, backend.authenticate, self.request, authorization_code='testcode')
Loading