Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,14 @@ matrix:
env: TOXENV=py35
- python: "3.6"
env: TOXENV=py36
- python: "3.6"
env: TOXENV=py36-nooptionals
- python: "3.7"
env: TOXENV=py37
dist: xenial
sudo: true
- python: "3.7"
env: TOXENV=py37-nooptionals
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The 3.6 one of this can be removed now.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ok, will remove! Thanks for the review.

dist: xenial
sudo: true
- python: "pypy"
env: TOXENV=pypy
- python: "pypy3"
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: System :: Monitoring",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_gc_collector.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from __future__ import unicode_literals

import gc
import sys
import platform
import sys

if sys.version_info < (2, 7):
# We need the skip decorators from unittest2 on Python 2.6.
Expand Down
7 changes: 2 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = coverage-clean,py26,py27,py34,py35,py36,pypy,pypy3,{py27,py36}-nooptionals,coverage-report,flake8
envlist = coverage-clean,py26,py27,py34,py35,py36,py37,pypy,pypy3,{py27,py37}-nooptionals,coverage-report,flake8


[base]
Expand Down Expand Up @@ -32,19 +32,16 @@ deps =
{py27,py34,py35,py36,pypy,pypy3}: twisted
commands = coverage run --parallel -m pytest {posargs}


; Ensure test suite passes if no optional dependencies are present.
[testenv:py27-nooptionals]
deps =
{[base]deps}
futures
commands = coverage run --parallel -m pytest {posargs}

[testenv:py36-nooptionals]
deps = {[base]deps}
[testenv:py37-nooptionals]
commands = coverage run --parallel -m pytest {posargs}


[testenv:coverage-clean]
deps = coverage
skip_install = true
Expand Down