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.8. Drop support for Python 3.4. #14

Merged
merged 2 commits into from
Apr 9, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 2 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
language: python
sudo: false
python:
- 2.7
- 3.4
- 3.5
- 3.6
- 3.7
- 3.8
- pypy
- pypy3
matrix:
include:
- os: linux
dist: xenial
sudo: true
python: 3.7
install:
- pip install -U pip setuptools zope.testrunner
- pip install -U coveralls coverage
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 @@ Changes
4.3.2 (unreleased)
------------------

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

- Drop support for Python 3.4.


4.3.1 (2018-10-11)
Expand Down
210 changes: 0 additions & 210 deletions bootstrap.py

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ def read(*rnames):
'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',
'Natural Language :: English',
Expand All @@ -72,7 +72,7 @@ def read(*rnames):
'zope.component',
'zope.configuration',
'zope.i18nmessageid',
'zope.interface',
'zope.interface >= 3.8',
'zope.location',
'zope.schema',
'zope.security',
Expand Down
8 changes: 4 additions & 4 deletions src/zope/securitypolicy/role.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ def setIdOnActivation(role, event):
>>> role1 = LocalRole('Role 1', 'A first role')
>>> role1.id
u'<role not activated>'
>>> import zope.component.interfaces
>>> event = zope.component.interfaces.Registered(
>>> import zope.interface.interfaces
>>> event = zope.interface.interfaces.Registered(
... Registration(role1, 'role1'))

Now we pass the event into this function, and the id of the role should be
Expand All @@ -87,8 +87,8 @@ def unsetIdOnDeactivation(role, event):
>>> role1 = LocalRole('Role 1', 'A first role')
>>> role1.id = 'role1'

>>> import zope.component.interfaces
>>> event = zope.component.interfaces.Unregistered(
>>> import zope.interface.interfaces
>>> event = zope.interface.interfaces.Unregistered(
... Registration(role1, 'role1'))

Now we pass the event into this function, and the id of the role should be
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[tox]
envlist =
py27,
py34,
py35,
py36,
py37,
py38,
pypy,
pypy3,
coverage
Expand Down