Skip to content

Commit

Permalink
Merge pull request #118 from jazzband/chore/django32-eol
Browse files Browse the repository at this point in the history
Remove Django 3.2 shims
  • Loading branch information
sergei-maertens authored May 3, 2024
2 parents 72d659b + ee4dab2 commit c0db980
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 29 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: ['3.8', '3.9', '3.10', '3.11', '3.12']
django: ['3.2', '4.2', '5.0']
exclude:
- python: '3.11'
django: '3.2'
- python: '3.12'
django: '3.2'
python: ['3.10', '3.11', '3.12']
django: ['4.2', '5.0']
include:
- python: '3.8'
django: '5.0'
django: '4.2'
- python: '3.9'
django: '5.0'
django: '4.2'

name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }})

Expand Down
8 changes: 0 additions & 8 deletions cookie_consent/compat.py

This file was deleted.

2 changes: 1 addition & 1 deletion cookie_consent/views.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
from django.contrib.auth.views import RedirectURLMixin
from django.core.exceptions import SuspiciousOperation
from django.http import HttpRequest, HttpResponse, HttpResponseRedirect, JsonResponse
from django.middleware.csrf import get_token as get_csrf_token
from django.urls import reverse
from django.utils.http import url_has_allowed_host_and_scheme
from django.views.generic import ListView, View

from .compat import RedirectURLMixin
from .models import CookieGroup
from .util import (
accept_cookies,
Expand Down
2 changes: 0 additions & 2 deletions requirements/base.txt

This file was deleted.

2 changes: 0 additions & 2 deletions requirements/dev.txt

This file was deleted.

3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ keywords = cookies, cookie-consent, cookie bar
classifiers =
Development Status :: 4 - Beta
Framework :: Django
Framework :: Django :: 3.2
Framework :: Django :: 4.2
Framework :: Django :: 5.0
Intended Audience :: Developers
Expand All @@ -40,7 +39,7 @@ zip_safe = False
include_package_data = True
packages = find:
install_requires =
django >= 3.2
django >= 4.2
django-appconf
tests_require =
pytest
Expand Down
6 changes: 1 addition & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[tox]
envlist =
py{38,39}-django{32,42}
py310-django32
py{38,39}-django42
py{310,311,312}-django{42,50}
isort
black
Expand All @@ -19,7 +18,6 @@ python =

[gh-actions:env]
DJANGO =
3.2: django32
4.2: django42
5.0: django50

Expand All @@ -31,7 +29,6 @@ extras =
tests
coverage
deps =
django32: Django~=3.2.0
django42: Django~=4.2.0
django50: Django~=5.0.0
commands =
Expand Down Expand Up @@ -78,6 +75,5 @@ extras =
docs
commands=
pytest check_sphinx.py -v \
--junitxml=../reports/junit.xml \
--tb=auto \
{posargs}

0 comments on commit c0db980

Please sign in to comment.