Skip to content

Commit

Permalink
Drop support for Python 3.4; add support for 3.8. (#23)
Browse files Browse the repository at this point in the history
Refactor tox.ini.
  • Loading branch information
Michael Howitz committed Mar 27, 2020
1 parent 96bf981 commit f93a575
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 247 deletions.
3 changes: 0 additions & 3 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ source =
ComputedAttribute
ExtensionClass
MethodObject
omit =
tests/*.py
bootstrap.py

[report]
precision = 2
11 changes: 4 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
language: python
sudo: false
python:
- 2.7
- 3.4
- 3.5
- 3.6
- 3.7
- 3.8
- pypy
- pypy3
matrix:
jobs:
include:
- python: "2.7"
env: PURE_PYTHON=1
- python: "3.7"
dist: xenial
sudo: true
env: PURE_PYTHON=1
install:
- pip install -U pip setuptools
- pip install -U coverage coveralls
Expand Down
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ Changelog
4.5 (unreleased)
----------------

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

- Add support for Python 3.8.


4.4 (2018-10-05)
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ExtensionClass

This package provides a metaclass that allows classes implemented in
extension modules to be subclassed in Python. Unless you need
ExtensionClasses for legacy applications (e.g. Zope 2), you probably
ExtensionClasses for legacy applications (e.g. Zope), you probably
want to use Python's new-style classes (available since Python 2.2).

ComputedAttribute
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ environment:
matrix:
- python: 27
- python: 27-x64
- python: 34
- python: 34-x64
- python: 35
- python: 35-x64
- python: 36
- python: 36-x64
- python: 37
- python: 37-x64
- python: 38
- python: 38-x64

install:
- "SET PATH=C:\\Python%PYTHON%;c:\\Python%PYTHON%\\scripts;%PATH%"
Expand Down
189 changes: 0 additions & 189 deletions bootstrap.py

This file was deleted.

7 changes: 0 additions & 7 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,5 @@
ignore = C901,N801,N802,N803,N805,N806,N812,E301
exclude = bootstrap.py

[nosetests]
nocapture=1
cover-package=ComputedAttribute,ExtensionClass,MethodObject
cover-erase=1
with-doctest=1
where=src

[coverage:report]
show_missing = True
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@
"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",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
],
Expand Down
47 changes: 11 additions & 36 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,53 +1,28 @@
[tox]
envlist =
py27,py27-pure,py34,py34-pure,py35,py35-pure,py36,py36-pure,py37,py37-pure, pypy,pypy3,coverage
py27, py27-pure,
py35, py35-pure,
py36, py36-pure,
py37, py37-pure,
py38, py38-pure,
pypy,
pypy3,
coverage

[testenv]
install_command = pip install {opts} {packages}
commands =
zope-testrunner --test-path=src
deps =
.[test]

[testenv:py27-pure]
basepython =
python2.7
setenv =
PURE_PYTHON = 1

[testenv:py34-pure]
basepython =
python3.4
setenv =
PURE_PYTHON = 1

[testenv:py35-pure]
basepython =
python3.5
extras = test
setenv =
PURE_PYTHON = 1

[testenv:py36-pure]
basepython =
python3.6
setenv =
PURE_PYTHON = 1

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

[testenv:coverage]
usedevelop = true
basepython =
python3.6
python3.7
commands =
coverage run -m zope.testrunner --test-path=src
coverage report --fail-under=100
deps =
{[testenv]deps}
coverage
setenv =
PURE_PYTHON = 1

0 comments on commit f93a575

Please sign in to comment.