Skip to content

Commit

Permalink
Merge 8707e57 into 412bebe
Browse files Browse the repository at this point in the history
  • Loading branch information
vernans committed Oct 3, 2018
2 parents 412bebe + 8707e57 commit 0394bfd
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 7 deletions.
16 changes: 10 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,24 @@ python:
- 3.5
- 3.6
- pypy
- pypy3.3-5.2-alpha1

- pypy3
include:
matrix:
- python: "3.7"
dist: xenial
sudo: true
install:
- pip install coveralls coverage
- pip install six==1.10.0 # force to avoid conflict with zc.recipe.testrunner
- pip install -U setuptools==33.1.1
- pip install zc.buildout
- buildout bootstrap
- buildout

script:
- bin/test -v1
- coverage run bin/test -v1
after_success:
- coveralls
notifications:
email: false

cache:
pip: true
directories:
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Changelog

- Avoid deprecation warnings by using current API.

- Added support for Python 3.7.

4.4.4 (2017-11-24)
------------------

Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,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 @@ -63,6 +63,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",
],
Expand Down
8 changes: 7 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py27,py27-pure,py34,py34-pure,py35,py35-pure,py36,py36-pure,pypy,pypy3,coverage
py27,py27-pure,py34,py34-pure,py35,py35-pure,py36,py36-pure,py37,py37-pure,pypy,pypy3,coverage

[testenv]
install_command = pip install --no-cache-dir --no-binary=:all: {opts} {packages}
Expand Down Expand Up @@ -35,6 +35,12 @@ basepython =
setenv =
PURE_PYTHON = 1

[testenv:py37-pure]
basepython =
python3.7
setenv =
PURE_PYTHON = 1

[testenv:coverage]
basepython =
python2.7
Expand Down

0 comments on commit 0394bfd

Please sign in to comment.