Merge pull request #2 from zopefoundation/py3.5+

Update to current Python versions.

.gitignore

@@ -1,9 +1,11 @@
 *.egg
+*.egg-info
 *.pyc
 /.installed.cfg
-/*.egg-info
 /bin
 /develop-eggs
 /doc.txt
 /eggs
 /parts
+/.tox
+/.coverage

.travis.yml

@@ -1,15 +1,3 @@
+version: ~> 1.0
 language: python
-python:
-    - 2.6
-    - 2.7
-    - 3.2
-    - 3.3
-install:
-    - pip install --upgrade setuptools
-    - pip install --upgrade zc.buildout
-    - buildout bootstrap
-    - ./bin/buildout
-script:
-    - ./bin/test -vvv
-notifications:
-    email: false
+import: zopefoundation/meta:travis-ci-config/minimal.yml

README.txt

@@ -9,6 +9,14 @@ Recipes for working with ZODB.
 Changes
 *******
 
+2.1.0 (unreleased)
+==================
+
+- Add support for Python 3.5 up to Python 3.8.
+
+- Drop support for Python 2,6, 3.2 and 3.3.
+
+
 2.0.0 (2014-02-12)
 ==================
 

setup.cfg

@@ -0,0 +1,2 @@
+[flake8]
+doctests = 1

setup.py

@@ -10,7 +10,7 @@ def read(*rnames):
     'Detailed Documentation\n'
     '**********************\n'
     + '\n' +
-    read('zc', 'zodbrecipes', 'zeo.txt')
+    read('src', 'zc', 'zodbrecipes', 'zeo.txt')
     + '\n' +
     'Download\n'
     '**********************\n'
@@ -24,13 +24,14 @@ def read(*rnames):
     'zope.event',
     'zope.testing',
     'zope.proxy',
+    'zope.testrunner',
     'zodbpickle',
     ]
 
 name = "zc.zodbrecipes"
 setup(
     name = name,
-    version='2.0.0',
+    version='2.1.0.dev0',
     author = "Jim Fulton",
     author_email = "jim@zope.com",
     description = "ZC Buildout recipes for ZODB",
@@ -39,11 +40,17 @@ def read(*rnames):
     url='http://svn.zope.org/'+name,
     long_description=long_description,
 
-    packages = find_packages('.'),
+    packages = find_packages('src'),
+    package_dir={'': 'src'},
     include_package_data = True,
     namespace_packages = ['zc'],
-    install_requires = ['zc.buildout', 'setuptools', 'six',
-                        'zc.recipe.egg', 'ZConfig >=2.4'],
+    install_requires = [
+        'zc.buildout',
+        'setuptools',
+        'six',
+        'zc.recipe.egg',
+        'ZConfig >=2.4'
+    ],
     extras_require = dict(test=tests_require),
     entry_points = {
         'zc.buildout': [
@@ -59,11 +66,12 @@ def read(*rnames):
 
         "Natural Language :: English",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.2",
-        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         ],
     test_suite='zc.zodbrecipes.tests.test_suite',
     tests_require=tests_require,

tox.ini

@@ -0,0 +1,30 @@
+[tox]
+envlist = flake8,
+          py27,
+          py35,
+          py36,
+          py37,
+          py38,
+          pypy,
+          pypy3,
+          coverage
+
+[testenv]
+usedevelop = true
+commands =
+    zope-testrunner --test-path=src []
+extras = test
+
+[testenv:coverage]
+basepython = python3.7
+commands =
+    coverage run -m zope.testrunner --test-path=src []
+    coverage report --fail-under=86
+deps =
+    coverage
+
+[testenv:flake8]
+basepython = python3.7
+skip_install = true
+deps = flake8
+commands = flake8 src setup.py