Skip to content

Commit

Permalink
Merge branch 'master' into drop-py2
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Oct 15, 2020
2 parents 4479b12 + 311b6ab commit c3eb66b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ python:
- 3.6
- 3.7
- 3.8
- 3.9-dev
- pypy3
jobs:
include:
- python: "3.7"
env: PURE_PYTHON=1
- python: "2.7"
env: PURE_PYTHON=1
install:
- pip install -U pip setuptools
- pip install -U coverage coveralls
Expand Down
6 changes: 5 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@

- Drop support for Python 2 and 3.5.


4.5.0 (2020-10-07)
==================

- Drop support for Python 3.4

- Add support for Python 3.8.
- Add support for Python 3.8 and 3.9.

- Fix accessing ``__parent__`` when it is defined as a class attribute
that is ``None`` (e.g., in subclasses of
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
],
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ envlist =
py36, py36-pure,
py37, py37-pure,
py38, py38-pure,
py39, py39-pure,
pypy3,
coverage

Expand Down

0 comments on commit c3eb66b

Please sign in to comment.