Django 4.2, Python 3.11 (#4098)

* Add Python 3.10 to test suite

* Support Django 4.2, remove Python 3.7 support and add Python 3.11 support

---------

Co-authored-by: Craig Weber <crgwbr@gmail.com>

.github/workflows/test.yml

@@ -18,11 +18,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.7, 3.8, 3.9]
-        django-version: [3.1, 3.2]
+        python-version: ['3.8', '3.9', '3.10', '3.11']
+        django-version: ['3.2', '4.0', '4.1', '4.2']
     services:
       postgres:
-        image: postgres:10
+        image: postgres:14
         ports:
           - 5432/tcp
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -54,7 +54,7 @@ jobs:
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1.5.2
       with:
-        fail_ci_if_error: true
+        fail_ci_if_error: false
   lint_python:
     runs-on: ubuntu-latest
     steps:
@@ -62,7 +62,7 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: '3.11'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -78,7 +78,7 @@ jobs:
     - name: Set up NodeJS
       uses: actions/setup-node@v2
       with:
-        node-version: '14'
+        node-version: '16'
     - name: Install dependencies
       run: |
         npm ci
@@ -92,7 +92,7 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: '3.11'
     - name: Build sandbox
       run: |
         python -m pip install --upgrade pip
@@ -104,7 +104,7 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: '3.11'
     - name: Build docs
       run: |
         make docs

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.11
 ENV PYTHONUNBUFFERED 1
 
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -

docs/source/conf.py

@@ -52,7 +52,7 @@ extensions = [
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
-    'sphinxcontrib.napoleon',
+    'sphinx.ext.napoleon',
     'sphinxcontrib.spelling',
     'sphinx_issues',
 ]

gulpfile.js/subtasks/copy.js

@@ -11,8 +11,7 @@ module.exports = function(done) {
         .pipe(gulp.dest("src/oscar/static/oscar/js/jquery"));
 
     gulp.src([
-        "node_modules/bootstrap/dist/js/bootstrap.bundle.js",
-        "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
+        "node_modules/bootstrap/dist/js/*",
     ]).pipe(gulp.dest("src/oscar/static/oscar/js/bootstrap4"));
 
     gulp.src("node_modules/bootstrap/fonts/*")
@@ -23,7 +22,7 @@ module.exports = function(done) {
         "node_modules/tempusdominus-bootstrap-4/build/css/*.min.css"
     ]).pipe(gulp.dest("src/oscar/static/oscar/js/bootstrap4-datetimepicker"));
 
-    gulp.src("node_modules/moment/min/moment-with-locales.min.js")
+    gulp.src("node_modules/moment/min/*")
         .pipe(gulp.dest("src/oscar/static/oscar/js/bootstrap4-datetimepicker"));
 
     gulp.src("node_modules/inputmask/dist/jquery.inputmask.min.js")

requirements.txt

@@ -13,7 +13,7 @@ django-redis>=4.12,<5.3
 pysolr>=3.9,<3.10
 redis>=3.5,<4.6
 requests>=2.25,<3
-uWSGI>=2.0.19,<2.1
+uWSGI>=2.0.19
 whitenoise>=5.2,<6.5
 
 # Linting

setup.py

@@ -18,7 +18,7 @@ sys.path.append(os.path.join(PROJECT_DIR, 'src'))
 from oscar import get_version  # noqa isort:skip
 
 install_requires = [
-    'django>=3.1,<3.3',
+    'django>=3.2,<4.3',
     # PIL is required for image fields, Pillow is the "friendly" PIL fork
     'pillow>=6.0',
     # We use the ModelFormSetView from django-extra-views for the basket page
@@ -43,15 +43,14 @@ install_requires = [
     'django-widget-tweaks>=1.4.1',
 ]
 
-sorl_thumbnail_version = 'sorl-thumbnail>=12.6,<12.7'
-easy_thumbnails_version = 'easy-thumbnails>=2.7,<2.8'
+sorl_thumbnail_version = 'sorl-thumbnail>=12.9,<12.10'
+easy_thumbnails_version = 'easy-thumbnails>=2.7,<2.8.6'
 
 docs_requires = [
-    'Sphinx>=4.2,<4.3',
-    'sphinxcontrib-napoleon==0.7',
-    'sphinxcontrib-spelling==7.2.1',
+    'Sphinx>=5.0',
+    'sphinxcontrib-spelling==7.5.1',
     'sphinx_rtd_theme==1.0.0',
-    'sphinx-issues==1.2.0',
+    'sphinx-issues==3.0.1',
     sorl_thumbnail_version,
     easy_thumbnails_version,
 ]
@@ -60,11 +59,12 @@ test_requires = [
     'WebTest>=2.0,<2.1',
     'coverage>=5.4,<5.5',
     'django-webtest>=1.9,<1.10',
-    'psycopg2-binary>=2.8,<2.9',
+    'psycopg2-binary>=2.8,<2.10',
     'pytest-django>=3.7,<3.9',
     'pytest-xdist>=2.2,<3',
     'tox>=3.21,<4',
     'freezegun>=1.1,<2',
+    'pytz',
     sorl_thumbnail_version,
     easy_thumbnails_version,
 ]
@@ -87,7 +87,7 @@ setup(
     package_dir={'': 'src'},
     packages=find_packages('src'),
     include_package_data=True,
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     install_requires=install_requires,
     extras_require={
         'docs': docs_requires,
@@ -99,16 +99,19 @@ setup(
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
+        'Framework :: Django :: 4.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: Unix',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Software Development :: Libraries :: Application Frameworks']
 )
 

src/oscar/apps/basket/abstract_models.py

@@ -126,7 +126,7 @@ class AbstractBasket(models.Model):
         lost.
         """
         if self.id is None:
-            return self.lines.none()
+            return self.lines.model.objects.none()
         if self._lines is None:
             self._lines = (
                 self.lines
@@ -523,7 +523,7 @@ class AbstractBasket(models.Model):
     @property
     def num_items(self):
         """Return number of items"""
-        return sum(line.quantity for line in self.lines.all())
+        return sum(line.quantity for line in self.all_lines())
 
     @property
     def num_items_without_discount(self):
@@ -599,9 +599,12 @@ class AbstractBasket(models.Model):
         The basket can contain multiple lines with the same product, but
         different options and stockrecords. Those quantities are summed up.
         """
-        matching_lines = self.lines.filter(product=product)
-        quantity = matching_lines.aggregate(Sum('quantity'))['quantity__sum']
-        return quantity or 0
+        if self.id:
+            matching_lines = self.lines.filter(product=product)
+            quantity = matching_lines.aggregate(Sum('quantity'))['quantity__sum']
+            return quantity or 0
+
+        return 0
 
     def line_quantity(self, product, stockrecord, options=None):
         """

src/oscar/apps/catalogue/abstract_models.py

@@ -220,8 +220,8 @@ class AbstractCategory(MP_Node):
             is_public=False, path__rstartswith=OuterRef("path"), depth__lt=OuterRef("depth")
         )
         self.get_descendants_and_self().update(
-            ancestors_are_public=Exists(
-                included_in_non_public_subtree.values("id"), negated=True))
+            ancestors_are_public=~Exists(
+                included_in_non_public_subtree.values("id")))
 
         # Correctly populate ancestors_are_public
         self.refresh_from_db()
@@ -599,7 +599,9 @@ class AbstractProduct(models.Model):
         """
         Test if this product has any stockrecords
         """
-        return self.stockrecords.exists()
+        if self.id:
+            return self.stockrecords.exists()
+        return False
 
     @property
     def num_stockrecords(self):

src/oscar/apps/dashboard/views.py

@@ -306,6 +306,13 @@ class PopUpWindowDeleteMixin(PopUpWindowMixin):
         else:
             return response
 
+    def post(self, request, *args, **kwargs):
+        """
+        Calls the delete() method on the fetched object and then
+        redirects to the success URL, or closes the popup, it it is one.
+        """
+        return self.delete(request, *args, **kwargs)
+
 
 class LoginView(auth_views.LoginView):
     template_name = 'oscar/dashboard/login.html'

src/oscar/apps/dashboard/vouchers/views.py

@@ -186,6 +186,9 @@ class VoucherDeleteView(generic.DeleteView):
             self.object.voucher_set.update_count()
         return response
 
+    def post(self, request, *args, **kwargs):
+        return self.delete(request, *args, **kwargs)
+
     def get_success_url(self):
         messages.warning(self.request, _("Voucher deleted"))
         if self.object.voucher_set is not None:

src/oscar/apps/shipping/abstract_models.py

@@ -83,7 +83,7 @@ class AbstractOrderAndItemCharges(AbstractBase):
                 incl_tax=D('0.00'))
 
         charge = self.price_per_order
-        for line in basket.lines.all():
+        for line in basket.all_lines():
             if line.product.is_shipping_required:
                 charge += line.quantity * self.price_per_item
 

src/oscar/apps/shipping/scales.py

@@ -30,6 +30,6 @@ class Scale(object):
 
     def weigh_basket(self, basket):
         weight = D('0.0')
-        for line in basket.lines.all():
+        for line in basket.all_lines():
             weight += self.weigh_product(line.product) * line.quantity
         return weight

tests/integration/basket/test_forms.py

@@ -81,6 +81,10 @@ class TestBasketLineForm(TestCase):
         form = self.build_form(quantity=6)
         self.assertTrue(form.is_valid())
         form.save()
+        # We set the _lines to None because the basket caches the lines here.
+        # We want the basket to do the query again.
+        # basket.num_items() will otherwise not return the correct values
+        self.basket._lines = None
         form = self.build_form(quantity=11)
         self.assertFalse(form.is_valid())
 

tests/integration/core/test_loading.py

@@ -1,7 +1,7 @@
 import sys
 from os.path import dirname
 
-from django.apps import AppConfig, apps
+from django.apps import apps
 from django.conf import settings
 from django.test import TestCase, override_settings
 
@@ -11,6 +11,8 @@ from oscar.core.loading import (
 from tests import temporary_python_path
 from tests._site.loader import DummyClass
 
+CustomerConfig = get_class("customer.apps", "CustomerConfig")
+
 
 class TestClassLoading(TestCase):
     """
@@ -98,7 +100,7 @@ class ClassLoadingWithLocalOverrideTests(TestCase):
     def test_overriding_view_is_possible_without_overriding_app(self):
         # If test fails, it's helpful to know if it's caused by order of
         # execution
-        customer_app_config = AppConfig.create('oscar.apps.customer')
+        customer_app_config = CustomerConfig.create('oscar.apps.customer')
         customer_app_config.ready()
         self.assertEqual(customer_app_config.summary_view.__module__,
                          'tests._site.apps.customer.views')

tests/integration/order/test_models.py

@@ -413,12 +413,12 @@ class OrderTests(TestCase):
     @override_settings(SECRET_KEY='order_hash_secret')
     def test_verification_hash_generation(self):
         order = OrderFactory(number='111000')
-        self.assertEqual(order.verification_hash(), '111000:UJrZWNPLsq7zf1r17c3v1Q6DUmE')
+        self.assertEqual(order.verification_hash(), '111000:Ra7jPGqhkcTm6VXKWEdKtFjA0wBIRVqdxED4bp313os')
 
     @override_settings(SECRET_KEY='order_hash_secret')
     def test_check_verification_hash_valid(self):
         order = OrderFactory(number='111000')
-        self.assertTrue(order.check_verification_hash('111000:UJrZWNPLsq7zf1r17c3v1Q6DUmE'))
+        self.assertTrue(order.check_verification_hash('111000:Ra7jPGqhkcTm6VXKWEdKtFjA0wBIRVqdxED4bp313os'))
 
     @override_settings(SECRET_KEY='order_hash_secret')
     def test_check_verification_hash_invalid_signature(self):

tests/settings.py

@@ -152,6 +152,7 @@ PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']
 ROOT_URLCONF = 'tests._site.urls'
 LOGIN_REDIRECT_URL = '/accounts/'
 STATIC_URL = '/static/'
+STATIC_ROOT = location('public/static')
 MEDIA_URL = '/media/'
 PUBLIC_ROOT = location('public')
 MEDIA_ROOT = os.path.join(PUBLIC_ROOT, 'media')
@@ -169,7 +170,6 @@ OSCAR_INITIAL_LINE_STATUS = 'a'
 OSCAR_LINE_STATUS_PIPELINE = {'a': ('b', ), 'b': ()}
 
 SECRET_KEY = 'notverysecret'
-# Removed in Django 4.0, then we need to update the hashes to SHA-256 in tests/integration/order/test_models.py
-DEFAULT_HASHING_ALGORITHM = 'sha1'
+
 TEST_RUNNER = 'django.test.runner.DiscoverRunner'
 FIXTURE_DIRS = [location('unit/fixtures')]

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{37,38,39}-django{31,32}
+    py{38,39,310,311}-django{32,40,41,42}
     lint
     sandbox
     docs
@@ -11,11 +11,13 @@ commands = coverage run --parallel -m pytest {posargs}
 extras = test
 pip_pre = true
 deps =
-    django31: django>=3.1,<3.2
     django32: django>=3.2,<3.3
+    django40: django>=4.0,<4.1
+    django41: django>=4.1,<4.2
+    django42: django>=4.2,<4.3
 
 [testenv:lint]
-basepython = python3.8
+basepython = python3.11
 deps =
     -r{toxinidir}/requirements.txt
 allowlist_externals = npm
@@ -28,16 +30,16 @@ commands =
 
 
 [testenv:sandbox]
-basepython = python3.8
+basepython = python3.11
 deps =
     -r{toxinidir}/requirements.txt
-    django>=3.2,<3.3
+    django>=4.2,<4.3
 allowlist_externals = make
 commands =
     make build_sandbox
 
 [testenv:docs]
-basepython = python3.8
+basepython = python3.11
 allowlist_externals = make
 changedir = {toxinidir}/docs
 pip_pre = false