Skip to content

Commit

Permalink
Merge 66871b3 into 226c872
Browse files Browse the repository at this point in the history
  • Loading branch information
TrangPham committed Jul 7, 2022
2 parents 226c872 + 66871b3 commit 8c5e980
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PYTHON_VERSION=3.8
DJANGO_VERSION=3.1.7
PYTHON_VERSION=3.9.9
DJANGO_VERSION=4.0.1
SELENIUM_VERSION=4.0.0a7
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ jobs:
options: --health-cmd="curl http://localhost:4566/health?reload" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
django-version: [2.2, 3.0]
python-version: [3.8, 3.9, 3.10.0]
django-version: [3.2, 4.0.4]
include:
- python-version: 3.7
django-version: 3.2
env:
DJANGO_VERSION: ${{ matrix.django-version }}
PYTHON_VERSION: ${{ matrix.python-version }}
Expand Down
3 changes: 2 additions & 1 deletion admin_confirm/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from django.contrib.admin import helpers
from django.db.models import Model, ManyToManyField, FileField, ImageField
from django.forms import ModelForm
from django.utils.decorators import method_decorator
from admin_confirm.utils import (
log,
get_admin_change_url,
Expand Down Expand Up @@ -103,7 +104,7 @@ def render_action_confirmation(self, request, context):
context,
)

@cache_control(private=True)
@method_decorator(cache_control(private=True))
def changeform_view(self, request, object_id=None, form_url="", extra_context=None):
if request.method == "POST":
if (not object_id and CONFIRM_ADD in request.POST) or (
Expand Down
5 changes: 0 additions & 5 deletions tests/market/apps.py

This file was deleted.

2 changes: 1 addition & 1 deletion tests/test_project/settings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# And running the server are different
# (Possibly due to test_project being within a subfolder)
# This defaults settings to local unless
# DJANGO_SETTINGS is specified.
# DJANGO_SETTINGS_MODULE is specified.
from .local import *

0 comments on commit 8c5e980

Please sign in to comment.