Skip to content

Commit

Permalink
Add support for Python 3.7; drop 3.3
Browse files Browse the repository at this point in the history
Builds have been failing on 3.3 recently.

Also drop python setup.py test. Add some badges to README.rst.
  • Loading branch information
jamadden committed Aug 24, 2018
1 parent 7d7157b commit 6938733
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 26 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ python:
- 3.4
- 3.5
- 3.6
- pypy-5.4.1
- 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
8 changes: 6 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
Changes
=======

4.2.1 (unreleased)
4.3.0 (unreleased)
------------------

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

- Drop support for Python 3.3.

- Drop support for ``python setup.py test``.


4.2.0 (2017-08-24)
Expand Down
20 changes: 17 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
``zope.securitypolicy``
=======================
=====================
zope.securitypolicy
=====================

.. image:: https://img.shields.io/pypi/v/zope.securitypolicy.svg
:target: https://pypi.python.org/pypi/zope.securitypolicy/
:alt: Latest release

.. image:: https://img.shields.io/pypi/pyversions/zope.securitypolicy.svg
:target: https://pypi.org/project/zope.securitypolicy/
:alt: Supported Python versions

.. image:: https://travis-ci.org/zopefoundation/zope.securitypolicy.svg?branch=master
:target: https://travis-ci.org/zopefoundation/zope.securitypolicy
:target: https://travis-ci.org/zopefoundation/zope.securitypolicy

.. image:: https://coveralls.io/repos/github/zopefoundation/zope.securitypolicy/badge.svg?branch=master
:target: https://coveralls.io/github/zopefoundation/zope.securitypolicy?branch=master



This package provides an useful security policy for Zope3. It's the
default security policy used in "zope3 the application" and many other
Expand Down
22 changes: 3 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,9 @@ def read(*rnames):
return f.read()


def alltests():
import os
import sys
import unittest
# use the zope.testrunner machinery to find all the
# test suites we've put under ourselves
import zope.testrunner.find
import zope.testrunner.options
here = os.path.abspath(os.path.join(os.path.dirname(__file__), 'src'))
args = sys.argv[:]
defaults = ["--test-path", here]
options = zope.testrunner.options.get_options(args, defaults)
suites = list(zope.testrunner.find.find_suites(options))
return unittest.TestSuite(suites)

setup(
name='zope.securitypolicy',
version='4.2.1.dev0',
version='4.3.0.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Default security policy for Zope3',
Expand All @@ -64,17 +49,17 @@ def alltests():
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Natural Language :: English',
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Framework :: Zope3'],
url='http://pypi.python.org/pypi/zope.securitypolicy',
url='https://github.com/zopefoundation/zope.securitypolicy',
license='ZPL 2.1',
packages=find_packages('src'),
package_dir={'': 'src'},
Expand Down Expand Up @@ -104,7 +89,6 @@ def alltests():
'zope.testing',
'zope.testrunner',
],
test_suite='__main__.alltests',
include_package_data=True,
zip_safe=False,
)
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,
py33,
py34,
py35,
py36,
py37,
pypy,
pypy3,
coverage-report,
Expand Down

0 comments on commit 6938733

Please sign in to comment.