Skip to content

Commit

Permalink
Merge branch 'master' into fix-pipetrigger
Browse files Browse the repository at this point in the history
  • Loading branch information
mgedmin committed Oct 19, 2018
2 parents fb5f908 + 6fe014a commit 47c5f3c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ python:
- 3.4
- 3.5
- 3.6
- pypy3
matrix:
include:
- python: 3.7
dist: xenial
sudo: true
install:
- pip install coveralls coverage
- pip install -e ".[test]"
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
- Fix pipetrigger.close() to close the right file descriptor.
(This could've been causing EBADF errors in unrelated places!)

- Add Python 3.7 support.


4.0.1 (2017-10-31)
==================
Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ environment:
- python: 35-x64
- python: 36
- python: 36-x64
- python: 37
- python: 37-x64

install:
- "SET PATH=C:\\Python%PYTHON%;c:\\Python%PYTHON%\\scripts;%PATH%"
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def read(*rnames):
'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',
'Natural Language :: English',
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ envlist =
py34,
py35,
py36,
py37,
pypy,
pypy3,
coverage

[testenv]
Expand Down

0 comments on commit 47c5f3c

Please sign in to comment.