Skip to content

Commit

Permalink
Support Django 5 and Python 3.10
Browse files Browse the repository at this point in the history
Also get rid of the nose test runner as it is not working well with Python 3.10
  • Loading branch information
ricobl committed Apr 28, 2024
1 parent 5416552 commit 07c358d
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 104 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:

strategy:
matrix:
python-version: ["3.9"]
django-version: ["3.2", "4.0.4"]
python-version: ["3.10"]
django-version: ["3.2", "4.0.4", "5.0"]

steps:
- name: Checkout repo
Expand All @@ -31,7 +31,7 @@ jobs:

- name: Install pipenv
run: pip install --user pipenv

- name: Install all dependencies, including development ones
run: pipenv sync --dev

Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ clean:
@rm -rf dist/ django_thumbor.egg-info/

run: clean
@./manage.py runserver
@pipenv run ./manage.py runserver

test: clean
@./manage.py test
@pipenv run ./manage.py test -v 2

shell: clean
@pipenv run ./manage.py shell

install:
@pipenv install --dev
Expand Down
3 changes: 1 addition & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ django = "*"
django-thumbor = {editable = true, path = "."}
bumpversion = "*"
coverage = "*"
django-nose = "*"
mock = "*"

[requires]
python_version = "3.9"
python_version = "3.10"

[scripts]
test = "make test"
Expand Down
173 changes: 84 additions & 89 deletions Pipfile.lock

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

8 changes: 0 additions & 8 deletions testproject/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,4 @@

INSTALLED_APPS = (
'django_thumbor',
'django_nose',
)

TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
NOSE_ARGS = [
'--nocapture',
'--nologcapture',
'--verbosity', '2',
]

0 comments on commit 07c358d

Please sign in to comment.