Skip to content

Commit

Permalink
Update to current Python versions.
Browse files Browse the repository at this point in the history
Additionally we have to pin an older `Sphinx` version to keep supporting
Python 2.
  • Loading branch information
Michael Howitz committed Apr 2, 2019
1 parent fcc4a7f commit 5ae2445
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 16 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
@@ -1,22 +1,22 @@
language: python
sudo: false
dist: xenial
matrix:
include:
- python: 2.7
- python: 3.4
- python: 3.5
- python: 3.6
- python: 3.7
dist: xenial
sudo: true
- python: pypy
- python: pypy3
- python: 3.8-dev
- python: pypy2.7-6.0
- python: pypy3.5-6.0
- python: 2.7
env:
- PURE_PYTHON=1
- ZOPE_WATCH_CHECKERS=1
- python: 3.4
- python: 3.7
env: ZOPE_WATCH_CHECKERS=1
- python: 3.7
env: PURE_PYTHON=1
install:
- pip install -U pip setuptools
- pip install -U coveralls coverage
Expand Down
8 changes: 5 additions & 3 deletions CHANGES.rst
Expand Up @@ -2,10 +2,12 @@
Changes
=========

4.3.2 (unreleased)
==================
5.0 (unreleased)
================

- Drop support for Python 3.4.

- Nothing changed yet.
- Add support for Python 3.8a3.


4.3.1 (2019-01-03)
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Expand Up @@ -132,7 +132,7 @@ def __str__(self):


setup(name='zope.security',
version='4.3.2.dev0',
version='5.0.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope Security Framework',
Expand Down Expand Up @@ -172,6 +172,7 @@ def __str__(self):
'build_ext': optional_build_ext,
},
features=features,
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
install_requires=[
'setuptools',
'zope.component',
Expand All @@ -195,7 +196,7 @@ def __str__(self):
],
'test': TESTS_REQUIRE,
'docs': [
'Sphinx',
'Sphinx < 2', # Version 2.0+ only supports Python 3.5+
'repoze.sphinx.autointerface',
],
},
Expand Down
15 changes: 11 additions & 4 deletions tox.ini
Expand Up @@ -3,7 +3,7 @@ envlist =
# Jython support pending 2.7 support, due 2012-07-15 or so. See:
# http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html
# py27,pypy,jython,py33,coverage,docs
py27,py27-watch,pypy,pypy3,py34-watch,py34,py35,py36,py37,coverage,docs
py27,py27-watch,pypy,pypy3,py35,py36,py37-watch,py37-pure,py37,py38,coverage,docs

[testenv]
commands =
Expand All @@ -20,13 +20,20 @@ setenv =
ZOPE_WATCH_CHECKERS = 1
PIP_CACHE_DIR = {envdir}/.cache

[testenv:py34-watch]
[testenv:py37-watch]
basepython =
python3.4
python3.7
setenv =
ZOPE_WATCH_CHECKERS = 1
PIP_CACHE_DIR = {envdir}/.cache

[testenv:py37-pure]
basepython =
python3.7
setenv =
PURE_PYTHON = 1
PIP_CACHE_DIR = {envdir}/.cache

[testenv:coverage]
usedevelop = true
basepython =
Expand All @@ -41,7 +48,7 @@ deps =

[testenv:docs]
basepython =
python3.4
python3.7
commands =
sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest

0 comments on commit 5ae2445

Please sign in to comment.