Merge pull request #25 from dabapps/django-upgrade-4.2

Django upgrade 4.2

Author: nvlaarhoven

.github/workflows/ci.yml

@@ -9,8 +9,13 @@ jobs:
 
     strategy:
       matrix:
-        python: ["3.8", "3.9", "3.10"]
-        django: ["3.2"]
+        python: ["3.8", "3.9", "3.10", "3.11"]
+        django: ["3.2", "4.0", "4.1", "4.2"]
+        exclude:
+          - python: "3.11"
+            django: "3.2"
+          - python: "3.11"
+            django: "4.0"
 
     steps:
     - uses: actions/checkout@v2

requirements.txt

@@ -1,3 +1,3 @@
-boto3==1.18.63
-Django==3.2.8
-django-fsm==2.8.0
+boto3==1.28.57
+Django==4.2.5
+django-fsm==2.8.1

s3_file_uploads/__init__.py

@@ -1 +1 @@
-__version__ = '0.0.7'
+__version__ = '0.0.8'

s3_file_uploads/urls.py

@@ -1,12 +1,12 @@
-from django.conf.urls import url
+from django.urls import re_path
 from s3_file_uploads import views
 
 
 app_name = 's3_file_uploads'
 
 
 urlpatterns = [
-    url(r'^$', view=views.UploadedFileCreateView.as_view(), name='upload-file-create'),
-    url(r'^(?P<file_id>[0-9a-f-]+)/$', view=views.UploadedFileFetchView.as_view(), name='upload-file-fetch'),
-    url(r'^(?P<file_id>[0-9a-f-]+)/complete/$', view=views.UploadedFileUploadCompleteView.as_view(), name='upload-file-complete'),
+    re_path(r'^$', view=views.UploadedFileCreateView.as_view(), name='upload-file-create'),
+    re_path(r'^(?P<file_id>[0-9a-f-]+)/$', view=views.UploadedFileFetchView.as_view(), name='upload-file-fetch'),
+    re_path(r'^(?P<file_id>[0-9a-f-]+)/complete/$', view=views.UploadedFileUploadCompleteView.as_view(), name='upload-file-complete'),
 ]

setup.py

@@ -16,9 +16,9 @@
 author_email = '[email protected]'
 license = 'BSD'
 install_requires = [
-    'boto3==1.18.63',
+    'boto3==1.28.57',
     'Django>=3.2',
-    'django-fsm==2.8.0'
+    'django-fsm==2.8.1'
 ]
 long_description_content_type="text/markdown",
 long_description = """

tests/requirements.txt

@@ -1,3 +1,3 @@
 -r ../requirements.txt
-djangorestframework==3.12.4
+djangorestframework==3.14.0
 model_mommy==2.0.0

tests/urls.py

@@ -1,6 +1,7 @@
-from django.conf.urls import include, url
+from django.conf.urls import include
+from django.urls import re_path
 
 
 urlpatterns = [
-    url(r'^s3-file-uploads/', view=include('s3_file_uploads.urls')),
+    re_path(r'^s3-file-uploads/', view=include('s3_file_uploads.urls')),
 ]