Skip to content

Commit a23f371

Browse files
authored
Merge pull request #113 from oscarmcm/main
Add support for Django 4.1
2 parents 28a5afb + 8cc6b34 commit a23f371

File tree

4 files changed

+29
-15
lines changed

4 files changed

+29
-15
lines changed

runtests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
'django.contrib.auth.middleware.AuthenticationMiddleware',
5858
'django.contrib.messages.middleware.MessageMiddleware',
5959
],
60+
DEFAULT_AUTO_FIELD='django.db.models.AutoField',
6061
)
6162

6263

setup.py

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
1-
from setuptools import find_packages
2-
from setuptools import setup
1+
from pathlib import Path
2+
from setuptools import find_packages, setup
33

44
from django_nyt import __version__
55

66

7-
packages = find_packages()
7+
this_directory = Path(__file__).parent
8+
long_description = (this_directory / 'README.rst').read_text()
9+
810

911
setup(
10-
name="django-nyt",
12+
name='django-nyt',
1113
version=__version__,
12-
author="Benjamin Bach",
13-
author_email="[email protected]",
14-
url="https://github.com/benjaoming/django-nyt",
15-
description="A pluggable notification system written for the Django framework.",
16-
license="Apache License 2.0",
17-
keywords=["django", "notification" "alerts"],
14+
author='Benjamin Bach',
15+
description='A pluggable notification system written for the Django framework.',
16+
long_description=long_description,
17+
long_description_content_type='text/x-rst',
18+
author_email='[email protected]',
19+
url='https://github.com/benjaoming/django-nyt',
20+
license='Apache License 2.0',
21+
keywords=['django', 'notification', 'alerts'],
1822
packages=find_packages(),
23+
include_package_data=True,
1924
zip_safe=False,
20-
install_requires=["django>=2.2,<4.1"],
25+
install_requires=['django>=2.2,<4.2'],
26+
python_requires='>=3.5',
2127
classifiers=[
2228
'Development Status :: 5 - Production/Stable',
2329
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
@@ -38,5 +44,11 @@
3844
'Programming Language :: Python :: 3.10',
3945
'Programming Language :: Python :: 3 :: Only',
4046
],
41-
include_package_data=True,
47+
project_urls={
48+
'Funding': 'https://donate.pypi.org',
49+
'Documentation': 'https://django-nyt.readthedocs.io/en/latest/',
50+
'Release notes': 'https://github.com/django-wiki/django-nyt/releases',
51+
'Source': 'https://github.com/django-wiki/django-nyt',
52+
'Tracker': 'https://github.com/django-wiki/django-nyt/issues',
53+
},
4254
)

test-project/testproject/settings/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737

3838
STATIC_ROOT = os_path.join(PROJECT_PATH, 'static')
3939
STATIC_URL = '/static/'
40-
STATICFILES_DIRS = (
41-
)
40+
STATICFILES_DIRS = ()
4241
STATICFILES_FINDERS = (
4342
'django.contrib.staticfiles.finders.FileSystemFinder',
4443
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
@@ -154,3 +153,4 @@
154153

155154

156155
NYT_ENABLE_ADMIN = True
156+
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
# Ensure you add to .circleci/config.yml if you add here
3-
envlist = {py35,py36,py37,py38,py39,pypy}-django{22,30,31,32},{py36,py37,py38,py39,py310}-django{32},{py38,py39,py310}-django{40},
3+
envlist = {py35,py36,py37,py38,py39,pypy}-django{22,30,31,32},{py36,py37,py38,py39,py310}-django{32},{py38,py39,py310}-django{40},{py38,py39,py310}-django{41},
44

55
[testenv]
66
passenv = CODECOV_TOKEN
@@ -22,6 +22,7 @@ deps =
2222
django31: Django>=3.1,<3.2
2323
django32: Django>=3.2,<3.3
2424
django40: Django>=4.0,<4.1
25+
django41: Django>=4.1,<4.2
2526

2627
basepython =
2728
py35: python3.5

0 commit comments

Comments
 (0)