Skip to content

Commit

Permalink
Upgrade to Django 3.
Browse files Browse the repository at this point in the history
  • Loading branch information
dracos committed Nov 19, 2023
1 parent 3d8cb10 commit 0fbc69c
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
python-version: [3.9]
thing-to-test: [flake8, django-v2, django-v3]
thing-to-test: [flake8, django-v3, django-v4]

steps:
- uses: actions/checkout@v2
Expand Down
18 changes: 18 additions & 0 deletions profiles/migrations/0007_alter_user_first_name.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.23 on 2023-11-19 18:44

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('profiles', '0006_auto_20210403_1805'),
]

operations = [
migrations.AlterField(
model_name='user',
name='first_name',
field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
),
]
9 changes: 3 additions & 6 deletions requirements-base.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
mysqlclient==2.0.2
Pillow==10.1.0
# Upgrade to 8.0.0 when DJ3
django-cleanup==6.0.0
django-cleanup==8.0.0
django-contrib-comments==2.2.0
# Upgrade to 5.0.8 when DJ3
django-reversion==4.0.2
# Upgrade to 12.10.0 when running on DJ3
sorl-thumbnail==12.8.0
django-reversion==5.0.8
sorl-thumbnail==12.10.0
python-dateutil==2.8.2
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django==2.2.28
Django==3.2.23
-r requirements-base.txt
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[tox]
skipsdist = True
envlist = flake8, django-v{2,3,4}
envlist = flake8, django-v{3,4}

[testenv]
basepython = python3.9
commands = python -W all -W ignore::PendingDeprecationWarning -m coverage run manage.py test --keepdb
deps =
coverage
-r{toxinidir}/requirements-base.txt
v2: Django>=2,<3
v3: Django>=3,<4
v4: Django>=4,<5

Expand All @@ -26,6 +25,5 @@ extend-ignore=E402,E722,E501
[gh-actions:env]
THING_TO_TEST =
flake8: flake8
django-v2: django-v2
django-v3: django-v3
django-v4: django-v4

0 comments on commit 0fbc69c

Please sign in to comment.