Merge branch 'master' into lint

.travis.yml

@@ -1,16 +1,16 @@
 language: python
 python:
     - 2.7
-    - 3.4
-    - 3.5
     - 3.6
-    - pypy-5.6.0
+    - pypy
+    - pypy3
 
 matrix:
   include:
     - name: "lint"
       python: 3.6
       env: TOXENV="lint"
+
 install:
     - pip install -U pip setuptools
     - pip install -U coverage coveralls

CHANGES.rst

@@ -1,10 +1,12 @@
 Changes
 =======
 
-4.2.1 (unreleased)
+4.3.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Drop support for running the tests using ``python setup.py test``.
+
+- Drop support for Python 3.4 and 3.5.
 
 
 4.2.0 (2017-07-25)

setup.py

@@ -27,22 +27,6 @@ def read(*path):
         return f.read() + '\n\n'
 
 
-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)
-
-
 long_description = '\n\n'.join([
     read('README.rst'),
     read('CHANGES.rst')
@@ -57,7 +41,7 @@ def alltests():
 
 setup(
     name="zope.dublincore",
-    version='4.2.1.dev0',
+    version='4.3.0.dev0',
     url='http://github.com/zopefoundation/zope.dublincore',
     license='ZPL 2.1',
     description='Zope Dublin Core implementation',
@@ -75,8 +59,6 @@ def alltests():
         '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 :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
@@ -101,8 +83,6 @@ def alltests():
         'zope.schema',
         'zope.security[zcml]>=3.8',
     ],
-    test_suite='__main__.alltests',
-    tests_require=tests_require,
     extras_require={
         'testing': tests_require,
         'test': tests_require,

tox.ini

@@ -3,10 +3,9 @@ envlist =
     lint,
     py27,
     pypy,
-    py34,
-    py35,
     py36,
     pypy3,
+    docs
 
 [testenv]
 usedevelop = true