Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DRAFT: GitHub Actions: Test on Python v3.12 and Django v5.0 #4213

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 16 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,19 @@ jobs:
name: Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }}
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
django-version: ['3.2', '4.0', '4.1', '4.2']
fail-fast: false
matrix: # https://docs.djangoproject.com/en/stable/faq/install/#what-python-version-can-i-use-with-django
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
django-version: ['3.2', '4.2', '5.0']
exclude:
- django-version: "3.2"
python-version: "3.11"
- django-version: "3.2"
python-version: "3.12"
- django-version: "5.0"
python-version: "3.8"
- django-version: "5.0"
python-version: "3.9"
services:
postgres:
image: postgres:14
Expand Down Expand Up @@ -62,7 +71,7 @@ jobs:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down Expand Up @@ -91,7 +100,7 @@ jobs:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Build sandbox
run: |
python -m pip install --upgrade pip
Expand All @@ -103,7 +112,7 @@ jobs:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
- name: Build docs
run: |
make docs
8 changes: 5 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
from oscar import get_version # noqa isort:skip

install_requires = [
'django>=3.2,<4.3',
'django>=3.2,<5.1',
# 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
'django-extra-views>=0.13,<0.15',
# Search support
'django-haystack>=3.0b1',
# Search support # We NEED a production release!!!
'django-haystack @ git+https://github.com/django-haystack/django-haystack.git',
# Treebeard is used for categories
'django-treebeard>=4.3.0',
# Babel is used for currency formatting
Expand Down Expand Up @@ -101,6 +101,7 @@
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.1',
'Framework :: Django :: 4.2',
'Framework :: Django :: 5.0',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: Unix',
Expand All @@ -110,6 +111,7 @@
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Topic :: Software Development :: Libraries :: Application Frameworks']
)

Expand Down
2 changes: 1 addition & 1 deletion src/oscar/apps/payment/abstract_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,4 +338,4 @@ def start_month(self, format="%m/%y"):

# pylint: disable=W0622
def expiry_month(self, format="%m/%y"):
return self.expiry_date.strftime(format)
return self.expiry_date.strftime(format) # pylint: disable=no-member