Skip to content

Django 2.2 & 3.0 #65

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 6 commits into from
Jan 16, 2020
Merged

Django 2.2 & 3.0 #65

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ea1b101
Add Django 2.2 and 3.0 to the build matrix
browniebroke Jan 14, 2020
d6dc2fd
Restrict coverage version to be <5 for now
browniebroke Jan 14, 2020
bffef00
Remove use of FILE_CHARSET setting in Django 3.1
browniebroke Jan 14, 2020
842c7e5
Update supported versions in README
browniebroke Jan 14, 2020
a3379a0
Update trove classifiers with newer Python
browniebroke Jan 14, 2020
ab5fb5c
Add a comment about removed setting in 3.1
browniebroke Jan 14, 2020
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: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ python:
- "3.4"
- "3.5"
- "3.6"
- "3.7"
- "3.8"
install: pip install tox-travis
script: tox
4 changes: 3 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ def read(*names, **kwargs):
Framework :: Django :: 1.11
Framework :: Django :: 2.0
Framework :: Django :: 2.1
Framework :: Django :: 2.2
Framework :: Django :: 3.0
"""

setup(
Expand All @@ -63,7 +65,7 @@ def read(*names, **kwargs):
url='https://github.com/nedbat/django_coverage_plugin',
packages=['django_coverage_plugin'],
install_requires=[
'coverage >= 4.0',
'coverage >= 4.0 , < 5',
Copy link
Member

@nedbat nedbat Jan 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do this?

Copy link
Collaborator

@jambonrose jambonrose Jan 14, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the test output of the first commit:

Traceback (most recent call last):
  File "tests/test_extends.py", line 16, in test_empty_block
    text = self.run_django_coverage()
  File "tests/plugin_test.py", line 139, in run_django_coverage
    for pl in self.cov.plugins:
AttributeError: 'Coverage' object has no attribute 'plugins'

I've been planning to switch to coverage.CoveragePlugin, but I've been swamped at work.

EDIT: The end of my comment about CoveragePlugin is misleading. Please ignore it!

Copy link
Contributor Author

@browniebroke browniebroke Jan 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, was failing without. I feel like it's out of scope of this PR?

Copy link
Collaborator

@jambonrose jambonrose Jan 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm in agreement.

Copy link
Member

@nedbat nedbat Jan 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK: #66

Copy link
Contributor Author

@browniebroke browniebroke Jan 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that this is broken on master (I think), should I move this to a separate pull request so you can make a patch release of this plugin before adding more stuff?

'six >= 1.4.0',
],
license='Apache 2.0',
Expand Down
9 changes: 6 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
envlist =
py27-django{18,19,110,111,111tip},
py34-django{18,19,110,111,111tip,20},
py35-django{18,19,110,111,111tip,20,21,tip},
py36-django{18,19,110,111,111tip,20,21,tip},
py37-django{20,21,tip},
py35-django{18,19,110,111,111tip,20,21,22},
py36-django{18,19,110,111,111tip,20,21,22,30,tip},
py37-django{20,21,22,30,tip},
py38-django{22,30,tip},
check,pkgcheck,doc

[testenv]
Expand All @@ -31,6 +32,8 @@ deps =
django111tip: https://github.com/django/django/archive/stable/1.11.x.tar.gz
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<3.0
django30: Django>=3.0,<3.1
djangotip: https://github.com/django/django/archive/master.tar.gz

commands =
Expand Down