Skip to content

Commit ec973e4

Browse files
authored
Merge pull request #4 from skip-pay/tda/chore/django_bump
chore: Django bump to <=5.0
2 parents 3e88f95 + 0c60d7f commit ec973e4

File tree

6 files changed

+6
-24
lines changed

6 files changed

+6
-24
lines changed

.github/workflows/django.yml

+1-19
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,8 @@ jobs:
1313
max-parallel: 4
1414
matrix:
1515
include:
16-
- python-version: "3.7"
17-
django-version: Django==3.1
18-
19-
- python-version: "3.8"
20-
django-version: Django==3.1
21-
22-
- python-version: "3.7"
23-
django-version: Django==3.2
24-
25-
- python-version: "3.8"
26-
django-version: Django==3.2
27-
28-
- python-version: "3.9"
29-
django-version: Django==3.2
30-
31-
- python-version: "3.10"
32-
django-version: Django==3.2
33-
3416
- python-version: "3.11"
35-
django-version: Django==3.2
17+
django-version: Django==4.2
3618

3719
steps:
3820
- uses: actions/checkout@v2

example/example/settings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"""
1212

1313
import os
14-
from django.utils.translation import ugettext as _
14+
from django.utils.translation import gettext as _
1515

1616
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
1717
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

example/example/urls.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
1. Import the include() function: from django.conf.urls import url, include
1414
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
1515
"""
16-
from django.conf.urls import url, include
16+
from django.urls import re_path as url, include
1717
from django.contrib import admin
1818

1919
urlpatterns = [

fperms/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '0.4.8.3'
1+
__version__ = '0.5.0'
22

33
from django.apps import apps as django_apps
44
from fperms.conf import settings

fperms/enums.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from fperms.conf import settings
2-
from django.utils.translation import ugettext_lazy as _
2+
from django.utils.translation import gettext_lazy as _
33

44

55
PERM_CODENAME_ADD = 'add'

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def get_version(*file_paths):
5656
],
5757
include_package_data=True,
5858
install_requires=[
59-
"django>=2.2.15",
59+
"django>=4.2.0",
6060
],
6161
license="MIT",
6262
zip_safe=False,

0 commit comments

Comments
 (0)