Skip to content
This repository has been archived by the owner on Apr 19, 2024. It is now read-only.

Commit

Permalink
Merge pull request #123 from openedx/django-cons-remove
Browse files Browse the repository at this point in the history
feat: Added support for django4.2
  • Loading branch information
UsamaSadiq authored Jun 12, 2023
2 parents 431b417 + 5986a95 commit d830609
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [quality, django32, django40]
toxenv: [quality, django32, django40, django42]
steps:
- uses: actions/checkout@v3
- name: setup python
Expand All @@ -36,7 +36,7 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django32'
if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
uses: codecov/codecov-action@v3
with:
flags: unittests
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ Unreleased

*

[1.3.0] - 2023-06-09
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Added
_____

* Added Support for Django42.

[1.2.0] - 2022-01-26
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def get_version(*file_paths):
],
include_package_data=True,
install_requires=[
"Django<4.0"
"Django<5.0"
],
license="Apache Software License 2.0",
zip_safe=False,
Expand All @@ -54,6 +54,7 @@ def get_version(*file_paths):
'Framework :: Django',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Natural Language :: English',
Expand Down
2 changes: 1 addition & 1 deletion splash/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Splash screen middleware for Django apps.
"""

__version__ = '1.2.1'
__version__ = '1.3.0'
4 changes: 2 additions & 2 deletions test_urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
""" ROOT_URLCONF for tests """
from django.conf.urls import url
from django.urls import re_path

from test_utils import views


urlpatterns = [
url(r'^home', views.home, name='home'),
re_path(r'^home', views.home, name='home'),
]
4 changes: 3 additions & 1 deletion tests/test_splash.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""

import logging
from unittest.mock import Mock

from django.contrib.auth import get_user_model
from django.contrib.auth.models import AnonymousUser
Expand All @@ -27,7 +28,8 @@ def setUp(self):
Init
"""
super().setUp()
self.splash_middleware = SplashMiddleware()
self.mock_response = Mock()
self.splash_middleware = SplashMiddleware(self.mock_response)
self.request_factory = RequestFactory(SERVER_NAME='example.org')
SplashConfig().save()

Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38-django{32,40}, quality
envlist = py38-django{32,40,42}, quality

[doc8]
max-line-length = 120
Expand All @@ -14,9 +14,10 @@ addopts = --cov splash --cov-report term-missing --cov-report xml
norecursedirs = .* docs requirements

[testenv]
deps =
deps =
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
django42: Django>=4.1,<5.0
-r{toxinidir}/requirements/test.txt
commands =
python -Wd -m pytest {posargs}
Expand Down

0 comments on commit d830609

Please sign in to comment.