Skip to content

Commit

Permalink
Merge 22cdb20 into fbc4cc1
Browse files Browse the repository at this point in the history
  • Loading branch information
mgedmin committed Jun 13, 2019
2 parents fbc4cc1 + 22cdb20 commit e746372
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
language: python
sudo: false
dist: xenial
python:
- 2.7
- 3.4
- 3.5
- 3.6
- 3.7
- pypy
- pypy3
matrix:
include:
- python: "3.7"
dist: xenial
sudo: true
install:
- pip install -U pip setuptools
- pip install -U coverage coveralls
Expand Down
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
Changes
=========

4.3.2 (unreleased)
4.4.0 (unreleased)
==================

- Nothing changed yet.
- Drop support for Python 3.4.


4.3.1 (2018-10-16)
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ def read(filename):
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py27,py34,py35,py36,py37,pypy,pypy3,coverage,docs
py27,py35,py36,py37,pypy,pypy3,coverage,docs

[testenv]
usedevelop = true
Expand Down

0 comments on commit e746372

Please sign in to comment.