Skip to content

Update copyright year, README for Django 2.0, add django versions to setup.py #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 18, 2018
Merged

Update copyright year, README for Django 2.0, add django versions to setup.py #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89a8e3e
update LICENSE up to 2018
tony Dec 26, 2017
603d0bd
add Django version classifiers
tony Dec 26, 2017
1183815
update README for django 2.0 support
tony Dec 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pytest-django is released under the BSD (3-clause) license
----------------------------------------------------------
Copyright (c) 2015, pytest-django authors (see AUTHORS file)
Copyright (c) 2015-2018, pytest-django authors (see AUTHORS file)
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pytest-django allows you to test your Django project/applications with the
<https://pytest-django.readthedocs.io/en/latest/contributing.html>`_
* Version compatibility:

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

Expand Down
7 changes: 6 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,22 @@ def read(fname):
install_requires=['pytest>=2.9'],
classifiers=['Development Status :: 5 - Production/Stable',
'Framework :: Django',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Topic :: Software Development :: Testing',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Software Development :: Testing',
],
# the following makes a plugin available to pytest
entry_points={'pytest11': ['django = pytest_django.plugin']})