Skip to content

Commit

Permalink
Merge pull request #6 from zopefoundation/issue5
Browse files Browse the repository at this point in the history
Drop support for Python 3.3 and setup.py test.
  • Loading branch information
jamadden committed Oct 19, 2018
2 parents b5faed0 + f91bfcf commit de06c08
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 78 deletions.
10 changes: 8 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@ language: python
sudo: false
python:
- 2.7
- 3.3
- 3.4
- 3.5
- 3.6
- pypy-5.4.1
- pypy
- pypy3
matrix:
include:
- python: "3.7"
dist: xenial
sudo: true

script:
- coverage run -m zope.testrunner --test-path=src --auto-color --auto-progress

Expand Down
25 changes: 15 additions & 10 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
Changes
=======
=========
Changes
=========

4.1.1 (unreleased)
------------------
4.2.0 (unreleased)
==================

- Nothing changed yet.
- Drop support for ``setup.py test``.

- Drop support for Python 3.3.

- Add support for Python 3.7.


4.1.0 (2017-05-03)
------------------
==================

- Add support for Python 3.5 and 3.6.

- Drop support for Python 3.2 and 2.6.


4.0.1 (2015-06-05)
------------------
==================

- Add support for Python 3.2 and PyPy3.


4.0.0 (2014-12-24)
------------------
==================

- Add support for PyPy. (PyPy3 is pending release of a fix for:
https://bitbucket.org/pypy/pypy/issue/1946)
Expand All @@ -33,7 +38,7 @@ Changes


4.0.0a1 (2013-02-22)
--------------------
====================

- Add support for Python 3.3.

Expand All @@ -44,6 +49,6 @@ Changes


3.5.5 (2010-01-09)
------------------
==================

- Initial release, extracted from ``zope.app.applicationcontrol``.
36 changes: 10 additions & 26 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,14 @@ def read(*rnames):
with open(os.path.join(os.path.dirname(__file__), *rnames)) as f:
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)

tests_require = [
'zope.testing',
'zope.testrunner',
]

setup(
name='zope.applicationcontrol',
version='4.1.1.dev0',
version='4.2.0.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope applicationcontrol',
Expand All @@ -65,34 +50,33 @@ 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 :: Zope :: 3',
],
url='http://github.com/zopefoundation/zope.applicationcontrol',
url='https://github.com/zopefoundation/zope.applicationcontrol',
extras_require={
'test': tests_require,
},
package_dir={'': 'src'},
packages=find_packages('src'),
namespace_packages=['zope'],
install_requires=[
'setuptools',
'zope.interface',
'zope.component',
'zope.location',
'zope.security',
'zope.traversing>=3.7.0',
],
'setuptools',
'zope.interface',
'zope.component',
'zope.location',
'zope.security',
'zope.traversing>=3.7.0',
],
tests_require=tests_require,
test_suite='__main__.alltests',
include_package_data=True,
zip_safe=False,
)
38 changes: 0 additions & 38 deletions test.py

This file was deleted.

13 changes: 11 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
[tox]
envlist =
py27, pypy, py33, py34, py35, py36
py27, pypy, py34, py35, py36, py37

[testenv]
usedevelop = true
commands =
zope-testrunner --test-path=src []
extras = test


[testenv:coverage]
basepython = python3.6
commands =
coverage run -m zope.testrunner --test-path=src []
coverage report -m --fail-under=100
deps =
.[test]
coverage

0 comments on commit de06c08

Please sign in to comment.