Skip to content

Commit 927d6c1

Browse files
authored
Merge pull request pytest-dev#566 from develtech/django-2.0-copy
Update copyright year, README for Django 2.0, add Django versions to setup.py.
2 parents 0fde43b + 1183815 commit 927d6c1

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pytest-django is released under the BSD (3-clause) license
22
----------------------------------------------------------
3-
Copyright (c) 2015, pytest-django authors (see AUTHORS file)
3+
Copyright (c) 2015-2018, pytest-django authors (see AUTHORS file)
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pytest-django allows you to test your Django project/applications with the
2828
<https://pytest-django.readthedocs.io/en/latest/contributing.html>`_
2929
* Version compatibility:
3030

31-
* Django: 1.8-1.11 and latest master branch (compatible at the time of each release)
31+
* Django: 1.8-1.11, 2.0 and latest master branch (compatible at the time of each release)
3232
* Python: CPython 2.7, 3.4-3.6 or PyPy 2, 3
3333
* pytest: >2.9.x
3434

setup.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,22 @@ def read(fname):
3333
install_requires=['pytest>=2.9'],
3434
classifiers=['Development Status :: 5 - Production/Stable',
3535
'Framework :: Django',
36+
'Framework :: Django :: 1.8',
37+
'Framework :: Django :: 1.9',
38+
'Framework :: Django :: 1.10',
39+
'Framework :: Django :: 1.11',
40+
'Framework :: Django :: 2.0',
3641
'Intended Audience :: Developers',
3742
'License :: OSI Approved :: BSD License',
3843
'Operating System :: OS Independent',
3944
'Programming Language :: Python',
40-
'Topic :: Software Development :: Testing',
4145
'Programming Language :: Python :: 2.7',
4246
'Programming Language :: Python :: 3.4',
4347
'Programming Language :: Python :: 3.5',
4448
'Programming Language :: Python :: 3.6',
4549
'Programming Language :: Python :: Implementation :: CPython',
4650
'Programming Language :: Python :: Implementation :: PyPy',
51+
'Topic :: Software Development :: Testing',
4752
],
4853
# the following makes a plugin available to pytest
4954
entry_points={'pytest11': ['django = pytest_django.plugin']})

0 commit comments

Comments
 (0)