bump django 5.2 and django-oscar to 4.0

Author: phedoreanu

.github/workflows/test.yml

@@ -14,11 +14,17 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        django-version: [2.2]
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+        django-version: ['4.2', '5.2']
+        exclude:
+          # Django 5.2(LTS) supports python 3.10 and up.
+          - django-version: '5.2'
+            python-version: '3.8'
+          - django-version: '5.2'
+            python-version: '3.9'
     services:
       postgres:
-        image: postgres:10
+        image: postgres:16
         ports:
           - 5432/tcp
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -50,18 +56,19 @@ jobs:
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1
       with:
-        fail_ci_if_error: true
+        fail_ci_if_error: false
   lint_python:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.7
+        python-version: 3.11
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        pip install -e .[test]
         pip install -r requirements.txt
     - name: Run linters
       run: |

paypal/__init__.py

@@ -1 +1 @@
-VERSION = '2.0.0'
+VERSION = '3.0.0'

requirements.txt

@@ -1,10 +1,8 @@
 # Testing
-django-oscar>=2.0,<3.2
-django-webtest==1.9.10
-tox>=3.20<4
-pytest-django==4.5.2
-pytest-cov>=2.10<3
-django-widget-tweaks==1.4.9
+django-oscar==4.0
+django-webtest
+pytest-django
+pytest-cov
 sorl-thumbnail
 coverage
 

sandbox/apps/shipping/repository.py

@@ -1,6 +1,6 @@
 from decimal import Decimal as D
 
-from oscar.apps.shipping.methods import Free, FixedPrice
+from oscar.apps.shipping.methods import FixedPrice, Free
 from oscar.apps.shipping.repository import Repository as CoreRepository
 
 

sandbox/settings.py

@@ -4,7 +4,8 @@
 
 # Django settings for oscar project.
 PROJECT_DIR = os.path.dirname(__file__)
-location = lambda x: os.path.join(os.path.dirname(os.path.realpath(__file__)), x)
+location = lambda x: os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                                  x)
 
 DEBUG = True
 TEMPLATE_DEBUG = True
@@ -21,12 +22,14 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',     # Add 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': location('db.sqlite'),              # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+        'ENGINE': 'django.db.backends.sqlite3',
+        # Add 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': location('db.sqlite'),
+        # Or path to database file if using sqlite3.
+        'USER': '',  # Not used with sqlite3.
+        'PASSWORD': '',  # Not used with sqlite3.
+        'HOST': '',  # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',  # Set to empty string for default. Not used with sqlite3.
     }
 }
 ATOMIC_REQUESTS = True
@@ -206,7 +209,6 @@
     }
 }
 
-
 INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -275,7 +277,8 @@
 APPEND_SLASH = True
 
 # Oscar settings
-from oscar.defaults import *    # noqa
+from oscar.defaults import *  # noqa
+
 OSCAR_ALLOW_ANON_CHECKOUT = True
 
 OSCAR_SHOP_TAGLINE = 'PayPal'
@@ -301,7 +304,6 @@
         ]
     })
 
-
 # Haystack settings
 HAYSTACK_CONNECTIONS = {
     'default': {

sandbox/urls.py

@@ -1,12 +1,11 @@
 from django.apps import apps
-from django.conf.urls.i18n import i18n_patterns
 from django.conf import settings
+from django.conf.urls.i18n import i18n_patterns
+from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-from django.conf.urls.static import static
 from django.urls import include, path
 
-
 admin.autodiscover()
 
 urlpatterns = [
@@ -17,11 +16,14 @@
     # PayPal Express integration...
     path('checkout/paypal/', include('paypal.express_checkout.urls')),
     # Dashboard views for Payflow Pro
-    path('dashboard/paypal/payflow/', apps.get_app_config("payflow_dashboard").urls),
+    path('dashboard/paypal/payflow/',
+         apps.get_app_config("payflow_dashboard").urls),
     # Dashboard views for Express
-    path('dashboard/paypal/express/', apps.get_app_config("express_dashboard").urls),
+    path('dashboard/paypal/express/',
+         apps.get_app_config("express_dashboard").urls),
     # Dashboard views for Express Checkout
-    path('dashboard/paypal/express-checkout/', apps.get_app_config('express_checkout_dashboard').urls),
+    path('dashboard/paypal/express-checkout/',
+         apps.get_app_config('express_checkout_dashboard').urls),
     path('', include(apps.get_app_config('oscar').urls[0])),
 )
 
@@ -31,6 +33,6 @@
         settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
     import debug_toolbar
-    urlpatterns = [
-        path('__debug__/', include(debug_toolbar.urls)),
-    ] + urlpatterns
+
+    urlpatterns = [path('__debug__/',
+                        include(debug_toolbar.urls)), ] + urlpatterns

setup.py

@@ -17,13 +17,13 @@
     packages=find_packages(exclude=['sandbox*', 'tests*']),
     include_package_data=True,
     install_requires=[
-        'django>=2.2,<4.2',
+        'django>=4.2',
         'paypal-checkout-serversdk>=1.0.1',
-        'requests>=2.26.0',
+        'requests',
         'django-localflavor'
     ],
     extras_require={
-        'oscar': ['django-oscar>=2.0,<4.0']
+        'oscar': ['django-oscar>=4.0']
     },
     # See http://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
@@ -35,9 +35,6 @@
         'Operating System :: Unix',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Other/Nonlisted Topic'],
 )

tests/settings.py

@@ -118,5 +118,5 @@
 SITE_ID = 1
 ROOT_URLCONF = 'tests.urls'
 
-STATIC_URL = '/'
-STATIC_ROOT = '/static/'
+STATIC_URL = '/static'
+MEDIA_URL = '/media'

tests/unit/express/view_tests.py

@@ -5,7 +5,7 @@
 from django.test import TestCase, override_settings
 from django.test.client import Client
 from django.urls import reverse
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from oscar.apps.basket.models import Basket
 from oscar.apps.order.models import Order
 from oscar.core.loading import get_classes
@@ -185,9 +185,9 @@ def perform_action(self):
     def test_context(self):
         self.assertEqual(D('33.98'), self.response.context['paypal_amount'])
         self.assertEqual('Royal Mail Signed For™ 2nd Class',
-                         force_text(self.response.context['shipping_method'].name))
+                         force_str(self.response.context['shipping_method'].name))
         self.assertEqual('uk_rm_2ndrecorded',
-                         force_text(self.response.context['shipping_method'].code))
+                         force_str(self.response.context['shipping_method'].code))
 
     def test_keys_in_context(self):
         keys = ('shipping_address', 'shipping_method',