Skip to content

Commit

Permalink
tox
Browse files Browse the repository at this point in the history
  • Loading branch information
omercnet committed Dec 11, 2022
1 parent b175ea6 commit f19a08d
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10"]
django-version: ["2.2", "3.2", "4.0", "4.1", "main"]
python-version: ["3.8", "3.9", "3.10"]
django-version: ["3.2", "4.0", "4.1", "main"]
exclude:
- python-version: "3.7"
django-version: "main"
Expand All @@ -40,7 +40,7 @@ jobs:
uses: actions/cache@v3
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}
key: ${{ matrix.python-version }}-v1-${{ hashFiles('**/poetry.lock') }}
restore-keys: |
${{ matrix.python-version }}-v1-
Expand Down
3 changes: 0 additions & 3 deletions django_descope/settings.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# flake8: noqa: E501
from inspect import getargs

from django.conf import settings
from django.core.exceptions import ImproperlyConfigured

Expand Down
22 changes: 11 additions & 11 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ classifiers = [

[tool.poetry.dependencies]
python = ">=3.8.1,<4.0"
django = ">=2.2,<5.0"
django = ">=3.2,<5.0"
descope = "==0.3.0"

[tool.poetry.group.dev.dependencies]
Expand Down
6 changes: 3 additions & 3 deletions settings.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
Django settings for myapp project.
Generated by 'django-admin startproject' using Django 4.1.
Generated by 'django-admin startproject' using Django 4.1
For more information on this file, see
https://docs.djangoproject.com/en/4.1/topics/settings/
Expand Down Expand Up @@ -34,8 +34,8 @@


DESCOPE_PROJECT_ID = os.environ.get(
"DESCOPE_PROJECT_ID"
) # <-- Set this to your project ID
"DESCOPE_PROJECT_ID" # <-- Set this to your project ID
)


# Application definition
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
[tox]
isolated_build=true
envlist=
py{38,39,310}-dj{22,32,40,41,main}
py{38,39,310}-dj{32,40,41,main}

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

[gh-actions:env]
DJANGO=
2.2: dj22
3.2: dj32
4.0: dj40
4.1: dj41
Expand All @@ -24,8 +22,8 @@ extras=
test
setenv=
PYTHONDONTWRITEBYTECODE=1
DESCOPE_PROJECT_ID=test
deps=
dj22: Django>=2.2,<2.3
dj32: Django>=3.2,<3.3
dj40: Django>=4.0,<4.1
dj41: Django>=4.1,<4.2
Expand Down

0 comments on commit f19a08d

Please sign in to comment.