Merge remote-tracking branch 'upstream/main' into release

Author: eru

.github/workflows/test.yml

@@ -9,19 +9,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox tox-gh-actions flake8 black
+          pip install tox tox-gh-actions black==22.12.0 isort==5.12.0 ruff==0.0.270
+
       - name: Lint
-        run: ./pep8.sh
+        run: ./lint.sh
       - name: Test with tox
         run: tox

README.md

@@ -7,7 +7,7 @@ Upstream: https://pypi.org/project/django-binary-database-files/
 Django Binary Database Files
 ============================
 
-[![](https://img.shields.io/pypi/v/django-binary-database-files.svg)](https://pypi.python.org/pypi/django-binary-database-files) [![Build Status](https://img.shields.io/travis/kimetrica/django-binary-database-files.svg?branch=master)](https://travis-ci.org/kimetrica/django-binary-database-files/) [![](https://pyup.io/repos/github/kimetrica/django-binary-database-files/shield.svg)](https://pyup.io/repos/github/kimetrica/django-binary-database-files)
+[![](https://img.shields.io/pypi/v/django-binary-database-files.svg)](https://pypi.python.org/pypi/django-binary-database-files) [![Build Status](https://github.com/Kimetrica/django-binary-database-files/actions/workflows/test.yml/badge.svg)](https://github.com/kimetrica/django-binary-database-files/actions) [![](https://pyup.io/repos/github/kimetrica/django-binary-database-files/shield.svg)](https://pyup.io/repos/github/kimetrica/django-binary-database-files)
 
 This is a storage system for Django that stores uploaded
 files in binary fields in the database. Files can be served from the database
@@ -101,27 +101,27 @@ Development
 
 Code should be linted with:
 
-    ./pep8.sh
+    ./lint.sh
 
 Tests require the Python development headers to be installed, which you can install on Ubuntu with:
 
-    sudo apt-get install python3-dev python3.6-dev
+    sudo apt-get install python3.12-minimal python3.12-dev
 
 To run unittests across multiple Python versions, install:
 
-    sudo apt-get install python3.6-minimal python3.6-dev python3.7-minimal python3.7-dev
+    sudo apt-get install python3.10-minimal python3.10-dev python3.11-minimal python3.11-dev python3.12-minimal python3.12-dev
 
 To run all [tests](http://tox.readthedocs.org/en/latest/):
 
     export TESTNAME=; tox
 
-To run tests for a specific environment (e.g. Python 3.6 with Django 2.2):
+To run tests for a specific environment (e.g. Python 3.12 with Django 5.0):
 
-    export TESTNAME=; tox -e py36-django22
+    export TESTNAME=; tox -e py312-django50
 
 To run a specific test:
 
-    export TESTNAME=.test_adding_file; tox -e py36-django22
+    export TESTNAME=.test_adding_file; tox -e py312-django50
 
 To build and deploy a versioned package to PyPI, verify [all unittests are passing](https://travis-ci.com/kimetrica/django-binary-database-files/), then increase (and commit) the version number in `binary_database_files/__init__.py` and then run:
 

binary_database_files/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 0, 17, "post1")
+VERSION = (1, 0, 18)
 __version__ = ".".join(map(str, VERSION))
 
 default_app_config = "binary_database_files.apps.DatabaseFilesAppConfig"

binary_database_files/management/commands/database_files_cleanup.py

@@ -1,8 +1,8 @@
+from django.apps import apps
 from django.conf import settings
 from django.core.files.storage import default_storage
 from django.core.management.base import BaseCommand
 from django.db.models import FileField, ImageField
-from django.apps import apps
 
 from binary_database_files.models import File
 

binary_database_files/management/commands/database_files_load.py

@@ -1,9 +1,9 @@
 import os
 
+from django.apps import apps
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db.models import FileField, ImageField
-from django.apps import apps
 
 
 class Command(BaseCommand):

binary_database_files/migrations/0001_initial.py

@@ -1,6 +1,6 @@
 # Generated by Django 1.9.1 on 2016-10-11 18:11
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

binary_database_files/models.py

@@ -1,12 +1,11 @@
 from django.conf import settings
 from django.db import models
-from django.utils import timezone
-
 from django.db.models import BinaryField
+from django.utils import timezone
 
 from binary_database_files import utils
-from binary_database_files.utils import write_file, is_fresh
 from binary_database_files.manager import FileManager
+from binary_database_files.utils import is_fresh, write_file
 
 
 class File(models.Model):

binary_database_files/storage.py

@@ -1,15 +1,15 @@
 """Custom storage backend that stores files in the database to facilitate scaling."""
 import os
-from io import UnsupportedOperation, BytesIO
+from io import BytesIO, UnsupportedOperation
 
 from django.conf import settings
 from django.core import files
 from django.core.files.storage import FileSystemStorage
 from django.utils._os import safe_join
 
 from binary_database_files import models
-from binary_database_files import utils
 from binary_database_files import settings as _settings
+from binary_database_files import utils
 
 
 class DatabaseFile(files.File):

binary_database_files/tests/tests.py

@@ -1,25 +1,25 @@
+import base64
 import functools
 import os
 import shutil
 import tempfile
-import base64
 from io import BytesIO
 from zipfile import ZipFile
 
 from django.conf import settings
 from django.core import files
 from django.core.files import File as DjangoFile
+from django.core.files.base import ContentFile
 from django.core.files.storage import default_storage
 from django.core.files.temp import NamedTemporaryFile
 from django.core.management import call_command
 from django.db import models
 from django.test import TestCase, override_settings
-from django.core.files.base import ContentFile
 
+from binary_database_files import utils
 from binary_database_files.models import File
 from binary_database_files.storage import DatabaseStorage
 from binary_database_files.tests.models import Thing
-from binary_database_files import utils
 
 DIR = os.path.abspath(os.path.split(__file__)[0])
 

binary_database_files/urls.py

@@ -1,4 +1,5 @@
 from django.urls import re_path
+
 from binary_database_files import views
 
 urlpatterns = [