Merge pull request #3452 from django-oscar/dependabot/pip/isort-5.1.1

Bump isort from 4.3.21 to 5.1.1

Makefile

@@ -83,8 +83,7 @@ coverage: venv ## Generate coverage report
 lint: ## Run flake8 and isort checks
 	flake8 src/oscar/
 	flake8 tests/
-	isort -c -q --recursive --diff src/
-	isort -c -q --recursive --diff tests/
+	isort -c -q --diff src/ tests/
 
 test_migrations: install-migrations-testing-requirements ## Tests migrations
 	cd sandbox && ./test_migrations.sh

requirements.txt

@@ -21,7 +21,7 @@ whitenoise==5.1.0
 flake8==3.8.3
 flake8-debugger==3.2.1
 flake8-blind-except==0.1.1
-isort==4.3.21
+isort==5.1.1
 
 # Helpers
 pyprof2calltree==1.4.5

src/oscar/apps/catalogue/receivers.py

@@ -10,6 +10,7 @@ Category = get_model("catalogue", "Category")
 
 if settings.OSCAR_DELETE_IMAGE_FILES:
     from django.db import models
+
     from oscar.core.thumbnails import get_thumbnailer
 
     ProductImage = get_model('catalogue', 'ProductImage')

src/oscar/core/compat.py

@@ -18,9 +18,9 @@ except ValueError:
 # Backward-compatible import for url_has_allowed_host_and_scheme.
 try:
     # Django 3.0 and above
-    from django.utils.http import url_has_allowed_host_and_scheme       # noqa F401
+    from django.utils.http import url_has_allowed_host_and_scheme  # noqa F401
 except ImportError:
-    from django.utils.http import is_safe_url as url_has_allowed_host_and_scheme    # noqa F401
+    from django.utils.http import is_safe_url as url_has_allowed_host_and_scheme  # noqa F401 isort:skip
 
 
 def get_user_model():

src/oscar/core/thumbnails.py

@@ -19,6 +19,7 @@ class SorlThumbnail(AbstractThumbnailer):
 
     def generate_thumbnail(self, source, **opts):
         from sorl.thumbnail import get_thumbnail
+
         # Sorl can accept only: "width x height", "width", "x height".
         # https://sorl-thumbnail.readthedocs.io/en/latest/template.html#geometry
         # So for example value '50x' must be converted to '50'.

tests/integration/core/test_autoslugfield.py

@@ -171,9 +171,10 @@ class AutoSlugFieldTest(TestCase):
         Tests making migrations with Django 1.7+'s migration framework
         """
 
-        import oscar
         from django.db import migrations
         from django.db.migrations.writer import MigrationWriter
+
+        import oscar
         from oscar.models.fields import AutoSlugField
         fields = {
             'autoslugfield': AutoSlugField(populate_from='otherfield'),

tox.ini

@@ -22,7 +22,7 @@ deps =
 commands =
     npm ci
     flake8 src tests setup.py
-    isort -c -q --recursive --diff src/ tests/
+    isort -c -q --diff src/ tests/
     npm run eslint
     django-admin.py compilemessages