Bump version, use path URLconf, update CI

Author: dcwatson

.github/workflows/ci.yml

@@ -26,12 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         django-version: [2.2, 3.0, 3.1]
-        python-version: [3.5, 3.6, 3.7, 3.8]
-        exclude:
-          - python-version: "3.5"
-            django-version: "3.0"
-          - python-version: "3.5"
-            django-version: "3.1"
+        python-version: [3.6, 3.7, 3.8, 3.9]
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python ${{ matrix.python-version }}

dbfiles/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 __version_info__ = tuple(int(num) for num in __version__.split("."))
 
 default_app_config = "dbfiles.apps.DBFilesConfig"

dbfiles/admin.py

@@ -2,8 +2,8 @@
 from django.template.defaultfilters import filesizeformat
 from django.urls import reverse
 
-from dbfiles.forms import DBFileForm
-from dbfiles.models import DBFile
+from .forms import DBFileForm
+from .models import DBFile
 
 
 @admin.register(DBFile)

dbfiles/forms.py

@@ -2,7 +2,7 @@
 from django.urls import reverse
 from django.utils.safestring import mark_safe
 
-from dbfiles.models import DBFile
+from .models import DBFile
 
 widget_template = """\
 <table>

dbfiles/storage.py

@@ -5,7 +5,7 @@
 from django.core.files.storage import Storage
 from django.utils.encoding import filepath_to_uri
 
-from dbfiles.models import DBFile
+from .models import DBFile
 
 
 class DBStorage(Storage):

dbfiles/urls.py

@@ -1,16 +1,16 @@
-import re
-
 from django.conf import settings
-from django.conf.urls import url
+from django.urls import path
 
-from dbfiles import views
+from . import views
 
 
 def dbfiles_url(prefix=settings.MEDIA_URL, view=views.DBFileView.as_view(), name="db_file", **kwargs):
-    prefix = re.escape(prefix.lstrip("/"))
-    return url(r"^{}(?P<name>.*)$".format(prefix), view, name=name, kwargs=kwargs)
+    prefix = prefix.lstrip("/")
+    if prefix and not prefix.endswith("/"):
+        prefix += "/"
+    return path("{}<path:name>".format(prefix), view, name=name, kwargs=kwargs)
 
 
 urlpatterns = [
-    dbfiles_url(""),
+    dbfiles_url(),
 ]

dbfiles/views.py

@@ -7,7 +7,7 @@
 from django.views.generic.base import View
 from django.views.static import was_modified_since
 
-from dbfiles.models import DBFile
+from .models import DBFile
 
 
 class DBFileView(View):