Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit e1fbc3c

Browse files
authored
chores: Allow latest dependencies (#19)
* chores: Upgrade to latest dependencies
1 parent ec24793 commit e1fbc3c

File tree

10 files changed

+17
-22
lines changed

10 files changed

+17
-22
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
deploy:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515
- name: Set up Python
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v4
1717
with:
1818
python-version: '3.x'
1919
- name: Install dependencies

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
style:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v2
17-
- name: Set up Python 3.6
18-
uses: actions/setup-python@v2
16+
- uses: actions/checkout@v3
17+
- name: Set up Python 3.11
18+
uses: actions/setup-python@v4
1919
with:
20-
python-version: 3.6
20+
python-version: 3.11
2121
- name: Install tox
2222
run: pip install tox
2323
- name: Style check
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
strategy:
2929
matrix:
30-
python-version: [3.9]
30+
python-version: [3.9, 3.11]
3131

3232
steps:
3333
- uses: actions/checkout@v2

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
.PHONY: style
22
style:
3-
black --target-version=py36 \
3+
black --target-version=py311 \
44
--line-length=120 \
55
--skip-string-normalization \
66
theme testapp setup.py
77

88
.PHONY: style_check
99
style_check:
10-
black --target-version=py36 \
10+
black --target-version=py311 \
1111
--line-length=120 \
1212
--skip-string-normalization \
1313
--check \

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
def get_install_requires():
55
install_requires = [
66
'Django>=3,<4',
7-
'django-jsoneditor>0.1,<0.2',
7+
'django-jsoneditor>0.1,<=0.2',
88
]
99

1010
try:

testapp/appone/migrations/0001_initial.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
initial = True
98

109
dependencies = []

testapp/appone/migrations/0002_car_doors.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
dependencies = [
98
('appone', '0001_initial'),
109
]

theme/urls.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import django
22
from django.contrib.auth.views import LogoutView
3-
from django.conf.urls import url
4-
from django.urls import path, re_path, include
3+
from django.urls import path, re_path
54
from . import views
65

76

@@ -19,7 +18,7 @@ def custom_server_error(request):
1918
path('register/', views.register_user, name="register"),
2019
path('logout/', LogoutView.as_view(), name="logout"),
2120
# Model Lookup
22-
url(r'^model_lookup/$', views.model_lookup_view, name='model_lookup'),
21+
re_path(r'^model_lookup/$', views.model_lookup_view, name='model_lookup'),
2322
# Testing Pages
2423
path("test-404/", custom_page_not_found),
2524
path("test-500/", custom_server_error),

theme/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from django.db import models, router
77
from django.utils.html import format_html
88
from django.urls import reverse, resolve, NoReverseMatch
9-
from django.utils.encoding import smart_text
9+
from django.utils.encoding import smart_str
1010
from django.utils.text import capfirst, slugify
11-
from django.utils.translation import ugettext_lazy as _
11+
from django.utils.translation import gettext_lazy as _
1212
from django.conf import settings
1313
from jsoneditor.forms import JSONEditor
1414

@@ -212,7 +212,7 @@ def get_admin_site(context):
212212
def get_model_instance_label(instance):
213213
if getattr(instance, "related_label", None):
214214
return instance.related_label()
215-
return smart_text(instance)
215+
return smart_str(instance)
216216

217217

218218
def get_original_menu_items(context):

theme/views.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ def login_view(request):
1313
msg = None
1414

1515
if request.method == "POST":
16-
1716
if form.is_valid():
1817
username = form.cleaned_data.get("username")
1918
password = form.cleaned_data.get("password")
@@ -41,7 +40,6 @@ def login_view(request):
4140

4241

4342
def register_user(request):
44-
4543
msg = None
4644
success = False
4745

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
33
flake8
4-
py{39}-dj{22,30,32}
4+
py{39,311}-dj{22,30,32}
55

66
[testenv]
77
deps =
@@ -12,7 +12,7 @@ deps =
1212
setenv =
1313
PYTHONPATH = {toxinidir}
1414
DJANGO_SETTINGS_MODULE = testapp.settings
15-
whitelist_externals = make
15+
allowlist_externals = make
1616
pip_pre = True
1717
commands = make coverage TEST_ARGS='{posargs:testapp}'
1818

0 commit comments

Comments
 (0)