From bd04d2ff7f7ea3416b5a839a516e2c358585e83e Mon Sep 17 00:00:00 2001 From: Narani van Laarhoven Date: Mon, 2 Oct 2023 10:07:07 +0200 Subject: [PATCH 1/4] Test for python 3.11 and Django 4.0, 4.1, 4.2 --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d029d87..14751bd 100644 --- a/.github/workflows/ci.yml +++ b/.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 From 97a77031366f4ba07e182265513e3e99d51ec499 Mon Sep 17 00:00:00 2001 From: Narani van Laarhoven Date: Mon, 2 Oct 2023 10:25:38 +0200 Subject: [PATCH 2/4] Bump all packages --- requirements.txt | 6 +++--- setup.py | 4 ++-- tests/requirements.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9f11d31..79090c6 100644 --- a/requirements.txt +++ b/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 diff --git a/setup.py b/setup.py index a8efc0f..81adcdc 100644 --- a/setup.py +++ b/setup.py @@ -16,9 +16,9 @@ author_email = 'engineering@dabapps.com' 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 = """ diff --git a/tests/requirements.txt b/tests/requirements.txt index bd04bd5..0489698 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,3 @@ -r ../requirements.txt -djangorestframework==3.12.4 +djangorestframework==3.14.0 model_mommy==2.0.0 From 6460ab474b655eb9d6416254b08accdef47f50ec Mon Sep 17 00:00:00 2001 From: Narani van Laarhoven Date: Mon, 2 Oct 2023 10:25:48 +0200 Subject: [PATCH 3/4] Fix imports --- s3_file_uploads/urls.py | 8 ++++---- tests/urls.py | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/s3_file_uploads/urls.py b/s3_file_uploads/urls.py index b1da260..3a0ced3 100644 --- a/s3_file_uploads/urls.py +++ b/s3_file_uploads/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path from s3_file_uploads import views @@ -6,7 +6,7 @@ urlpatterns = [ - url(r'^$', view=views.UploadedFileCreateView.as_view(), name='upload-file-create'), - url(r'^(?P[0-9a-f-]+)/$', view=views.UploadedFileFetchView.as_view(), name='upload-file-fetch'), - url(r'^(?P[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[0-9a-f-]+)/$', view=views.UploadedFileFetchView.as_view(), name='upload-file-fetch'), + re_path(r'^(?P[0-9a-f-]+)/complete/$', view=views.UploadedFileUploadCompleteView.as_view(), name='upload-file-complete'), ] diff --git a/tests/urls.py b/tests/urls.py index 758ef0e..b43f0e7 100644 --- a/tests/urls.py +++ b/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')), ] From 9f9cbd04e9e82f4297c14aeec22674e464261437 Mon Sep 17 00:00:00 2001 From: Narani van Laarhoven Date: Mon, 2 Oct 2023 10:25:56 +0200 Subject: [PATCH 4/4] Bump version --- s3_file_uploads/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s3_file_uploads/__init__.py b/s3_file_uploads/__init__.py index 2792152..9123cf0 100644 --- a/s3_file_uploads/__init__.py +++ b/s3_file_uploads/__init__.py @@ -1 +1 @@ -__version__ = '0.0.7' +__version__ = '0.0.8'