bump django to 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
@@ -48,20 +54,21 @@ jobs:
       run: |
         coverage run --parallel -m pytest -x
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v5.4.3
       with:
         fail_ci_if_error: true
   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
 

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,11 @@
         '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.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         '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',