Skip to content

Commit 56ea367

Browse files
committed
Support Django 5 and Python 3.10
Also get rid of the nose test runner as it is not working well with Python 3.10
1 parent 5416552 commit 56ea367

File tree

5 files changed

+93
-104
lines changed

5 files changed

+93
-104
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
python-version: ["3.9"]
18-
django-version: ["3.2", "4.0.4"]
17+
python-version: ["3.10"]
18+
django-version: ["3.2", "4.0.4", "5.0"]
1919

2020
steps:
2121
- name: Checkout repo
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Install pipenv
3333
run: pip install --user pipenv
34-
34+
3535
- name: Install all dependencies, including development ones
3636
run: pipenv sync --dev
3737

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ clean:
66
@rm -rf dist/ django_thumbor.egg-info/
77

88
run: clean
9-
@./manage.py runserver
9+
@pipenv run ./manage.py runserver
1010

1111
test: clean
12-
@./manage.py test
12+
@pipenv run ./manage.py test -v 2
13+
14+
shell: clean
15+
@pipenv run ./manage.py shell
1316

1417
install:
1518
@pipenv install --dev

Pipfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ django = "*"
1010
django-thumbor = {editable = true, path = "."}
1111
bumpversion = "*"
1212
coverage = "*"
13-
django-nose = "*"
1413
mock = "*"
1514

1615
[requires]
17-
python_version = "3.9"
16+
python_version = "3.10"
1817

1918
[scripts]
2019
test = "make test"

Pipfile.lock

Lines changed: 84 additions & 89 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testproject/settings.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,4 @@
5959

6060
INSTALLED_APPS = (
6161
'django_thumbor',
62-
'django_nose',
6362
)
64-
65-
TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
66-
NOSE_ARGS = [
67-
'--nocapture',
68-
'--nologcapture',
69-
'--verbosity', '2',
70-
]

0 commit comments

Comments
 (0)