Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Python 3.9. #43

Merged
merged 4 commits into from
Sep 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ parts
*.pyo
*.so
.coverage
.coverage.*
.installed.cfg
coverage.xml
develop-eggs
Expand Down
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
language: python
python:
- 2.7
- 3.5
- 3.6
- 3.7
- 3.8
- 3.9-dev
- pypy
- pypy3
matrix:
include:
- name: "2.7-pure"
python: "2.7"
env: PURE_PYTHON=1
- python: "3.7"
dist: xenial
- name: "3.7-pure"
python: "3.7"
- name: "3.8-pure"
python: "3.8"
env: PURE_PYTHON=1
dist: xenial
- python: "3.8"
dist: xenial
install:
- pip install -U coveralls coverage coverage-python-version
- pip install -U six
Expand Down
6 changes: 4 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
Changelog
=========

4.7 (unreleased)
5.0 (unreleased)
----------------

- Nothing changed yet.
- Add support for Python 3.8 and 3.9.

- Drop support for Python 3.5.


4.6 (2019-04-24)
Expand Down
3 changes: 0 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ include .coveragerc
include buildout.cfg
include tox.ini

include bootstrap.py
exclude bootstrap.py

include *.yml
exclude *.yml

Expand Down
6 changes: 2 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ 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.

1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
[flake8]
ignore = C901,N801,N802,N803,N805,N806,N812,E301
exclude = bootstrap.py
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
include_dirs=['include', 'src']),
]

version = '4.7.dev0'
version = '5.0.dev0'

setup(
name='Acquisition',
Expand All @@ -60,15 +60,15 @@
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"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",
],
ext_modules=ext_modules,
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*',
install_requires=[
'ExtensionClass >= 4.2.0',
'zope.interface',
Expand Down
45 changes: 9 additions & 36 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
[tox]
envlist =
py27,py27-pure,py35,py35-pure,py36,py36-pure,py37,py37-pure,py38,py38-pure,pypy,pypy3,coverage
py27,py27-pure,
py36,py36-pure,
py37,py37-pure,
py38,py38-pure,
py39,py39-pure,
pypy,
pypy3,
coverage

[testenv]
install_command = pip install --no-cache-dir --no-binary=:all: {opts} {packages}
Expand All @@ -13,41 +20,7 @@ deps =
setenv =
PIP_NO_CACHE = 1
COVERAGE_FILE=.coverage.{envname}

[testenv:py27-pure]
basepython =
python2.7
setenv =
PURE_PYTHON = 1
COVERAGE_FILE=.coverage.{envname}

[testenv:py35-pure]
basepython =
python3.5
setenv =
PURE_PYTHON = 1
COVERAGE_FILE=.coverage.{envname}

[testenv:py36-pure]
basepython =
python3.6
setenv =
PURE_PYTHON = 1
COVERAGE_FILE=.coverage.{envname}

[testenv:py37-pure]
basepython =
python3.7
setenv =
PURE_PYTHON = 1
COVERAGE_FILE=.coverage.{envname}

[testenv:py38-pure]
basepython =
python3.8
setenv =
PURE_PYTHON = 1
COVERAGE_FILE=.coverage.{envname}
pure,coverage: PURE_PYTHON = 1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've taken this approach from ExtensionClass.


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