Skip to content

Commit

Permalink
Merge pull request #64 from maykinmedia/feature/django-update
Browse files Browse the repository at this point in the history
⬆️  [#634] Updated Django version to 4.2
  • Loading branch information
sergei-maertens authored Jul 4, 2023
2 parents a798a09 + 6c1aec4 commit 7d57717
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 32 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: ['3.7', '3.8', '3.9', '3.10']
django: ['3.2', '4.0']
mozilla_django_oidc: ['1.2', '2.0']
python: ['3.8', '3.9', '3.10', '3.11']
django: ['3.2', '4.1', '4.2']
mozilla_django_oidc: ['2.0', '3.0']
exclude:
- python: '3.7'
django: '4.0'
- django: '4.0'
mozilla_django_oidc: '1.2'
- django: ['4.1', '4.2']
mozilla_django_oidc: '2.0'
- python: '3.11'
django: '3.2'

name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }}, mozilla-django-oidc ${{ matrix.mozilla_django_oidc }})

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ wheels/
.installed.cfg
*.egg
MANIFEST
reports/

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down
2 changes: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ Requirements
* setuptools 30.4.0 or above
* Django 3.2 or newer
* A database supporting ``models.JSONField``
* If you're using Django 4.1 or newer, you need at least mozilla-django-oidc 3.0.
2.0 is still supported with Django 3.2.


Install
Expand Down
1 change: 0 additions & 1 deletion mozilla_django_oidc_db/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@


class Migration(migrations.Migration):

initial = True

dependencies = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


class Migration(migrations.Migration):

dependencies = [
("mozilla_django_oidc_db", "0001_initial"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


class Migration(migrations.Migration):

dependencies = [
(
"mozilla_django_oidc_db",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@


class Migration(migrations.Migration):

dependencies = [
("mozilla_django_oidc_db", "0003_auto_20210719_0803"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


class Migration(migrations.Migration):

dependencies = [
("mozilla_django_oidc_db", "0004_auto_20210812_1044"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


class Migration(migrations.Migration):

dependencies = [
("mozilla_django_oidc_db", "0005_openidconnectconfig_sync_groups_glob_pattern"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@


class Migration(migrations.Migration):

dependencies = [
("mozilla_django_oidc_db", "0006_openidconnectconfig_unique_id_claim"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@


class Migration(migrations.Migration):

dependencies = [
("mozilla_django_oidc_db", "0007_auto_20220307_1128"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


class Migration(migrations.Migration):

dependencies = [
("auth", "0001_initial"),
("mozilla_django_oidc_db", "0008_auto_20220422_0849"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


class Migration(migrations.Migration):

dependencies = [
("mozilla_django_oidc_db", "0009_openidconnectconfig_default_groups"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


class Migration(migrations.Migration):

dependencies = [
("mozilla_django_oidc_db", "0010_openidconnectconfig_userinfo_claims_source"),
]
Expand Down
10 changes: 5 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,28 @@ classifiers =
Development Status :: 4 - Beta
Framework :: Django
Framework :: Django :: 3.2
Framework :: Django :: 4.0
Framework :: Django :: 4.1
Framework :: Django :: 4.2
Intended Audience :: Developers
Operating System :: Unix
Operating System :: MacOS
Operating System :: Microsoft :: Windows
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Topic :: Software Development :: Libraries :: Python Modules

[options]
zip_safe = False
include_package_data = True
packages = find:
install_requires =
django>=3.1.0
Django >=3.2
django-better-admin-arrayfield
django-solo
glom
mozilla-django-oidc >=1.0.0, <3.0
mozilla-django-oidc >=2.0.0
tests_require =
psycopg2
pytest
Expand Down Expand Up @@ -76,7 +77,6 @@ line_length = 88
multi_line_output = 3
skip = env,.tox,.history,.eggs
; skip_glob =
not_skip = __init__.py
known_django=django
known_first_party=mozilla_django_oidc_db
sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
Expand Down
18 changes: 9 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
[tox]
envlist =
py37-django32-mozilla_django_oidc{12,20}
py{38,39,310}-django32-mozilla_django_oidc{12,20}
py{38,39,310}-django40-mozilla_django_oidc20
py{38,39,310}-django32-mozilla_django_oidc{20}
py{38,39,310,311}-django{41,42}-mozilla_django_oidc{30}
isort
black
; docs
skip_missing_interpreters = true

[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310
3.11: py311

[gh-actions:env]
DJANGO =
3.2: django32
4.0: django40
4.1: django41
4.2: django42
MOZILLA_DJANGO_OIDC =
1.2: mozilla_django_oidc12
2.0: mozilla_django_oidc20

3.0: mozilla_django_oidc30
[testenv]
extras =
tests
coverage
deps =
django32: Django~=3.2.0
django40: Django~=4.0.0
mozilla_django_oidc12: mozilla-django-oidc~=1.2.4
django41: Django~=4.1.0
django42: Django~=4.2.0
mozilla_django_oidc20: mozilla-django-oidc~=2.0.0
mozilla_django_oidc30: mozilla-django-oidc~=3.0.0
passenv =
PGUSER
PGDATABASE
Expand Down

0 comments on commit 7d57717

Please sign in to comment.