Skip to content

Commit

Permalink
Attempt to fix master (#647)
Browse files Browse the repository at this point in the history
* Migrations of oauth2_provider has been squashed

reset migration dependencies accordingly

* Drop django 1.11 and 2.1
* Fix django3 selection
* Pin drf for doc as latest version is not yet supported
  • Loading branch information
ticosax committed Oct 25, 2020
1 parent 4b5b20e commit a4a1d58
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion testproj/users/migrations/0002_setup_oauth2_apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def add_oauth_apps(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('oauth2_provider', '0006_auto_20171214_2232'),
('oauth2_provider', '0002_auto_20190406_1805'),
('users', '0001_create_admin_user'),
]

Expand Down
21 changes: 9 additions & 12 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ isolated_build_env = .package

# https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
envlist =
py36-django{111,22}-drf{38,39},
py36-django{22}-drf{38,39},
py37-django22-drf{38,39,310,311},
py38-django{22,3}-drf{310,311},
py38-django22-drf{310,311},
py38-django3-drf{311},
djmaster, lint, docs
skip_missing_interpreters = true

Expand All @@ -17,17 +18,11 @@ deps =

[testenv]
deps =
django111: Django>=1.11,<2.0
django111: django-oauth-toolkit>=1.1.0,<1.2.0

django21: Django>=2.1,<2.2
django21: django-oauth-toolkit>=1.2.0

django22: Django>=2.2,<2.3
django22: django-oauth-toolkit>=1.2.0
django22: django-oauth-toolkit>=1.3.2

django3: Django>=2.2,<2.3
django3: django-oauth-toolkit>=1.2.0
django3: Django>=3.0,<4
django3: django-oauth-toolkit>=1.3.2

drf38: djangorestframework>=3.8,<3.9
drf39: djangorestframework>=3.9,<3.10
Expand All @@ -41,7 +36,7 @@ deps =
djmaster: https://github.com/django/django/archive/master.tar.gz
djmaster: https://github.com/ottoyiu/django-cors-headers/archive/master.tar.gz
djmaster: https://github.com/encode/django-rest-framework/archive/master.tar.gz
djmaster: django-oauth-toolkit>=1.2.0
djmaster: django-oauth-toolkit>=1.3.2

# other dependencies
-r requirements/validation.txt
Expand All @@ -60,6 +55,8 @@ commands =
[testenv:docs]
deps =
-r requirements/docs.txt
# latest supported version of DRF by current drf_yasg
djangorestframework>=3.11,<3.12
commands =
twine check .tox/dist/*
sphinx-build -WnEa -b html docs docs/_build/html
Expand Down

0 comments on commit a4a1d58

Please sign in to comment.