- add support for Python 3.9 and Zope 5

.travis.yml

@@ -16,17 +16,19 @@ matrix:
           env: TOXENV=py37
         - python: "3.8"
           env: TOXENV=py38
+        - python: "3.9"
+          env: TOXENV=py39
 
 before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS zmysqldatest;"
   - mysql -e "CREATE USER 'zmysqldatest'@'localhost' IDENTIFIED BY 'zmysqldatest';"
   - mysql -e "GRANT ALL PRIVILEGES ON zmysqldatest.* TO 'zmysqldatest'@'localhost';"
 
 install:
-    - travis_retry pip install -U pip setuptools tox
+    - pip install -U pip tox
 
 script:
-    - travis_retry tox
+    - tox
 
 notifications:
     email: false

CHANGES.txt

@@ -3,6 +3,7 @@ Products.ZMySQLDA change log
 
 4.9 (unreleased)
 ----------------
+- add support for Python 3.9 and Zope 5
 
 
 4.8 (2020-07-13)

MANIFEST.in

@@ -1,9 +1,14 @@
 include *.txt
 include *.rst
 include tox.ini
+include buildout*.cfg
 
-recursive-include Products *
-recursive-include docs *
+recursive-include docs *.py
+recursive-include docs *.rst
+recursive-include docs *.txt
+recursive-include docs Makefile
 
-global-exclude *.pyc
-global-exclude *.pyo
+recursive-include Products *.dtml
+recursive-include Products *.gif
+recursive-include Products *.py
+recursive-include Products *.svg

Products/ZMySQLDA/DA.py

@@ -69,10 +69,8 @@ class Connection(ConnectionBase):
     manage_properties._setName('manage_main')
     manage_main = manage_properties
 
-    manage_options = (
-        ConnectionBase.manage_options[1:] +
-        ({'label': 'Browse', 'action': 'manage_browse'},)
-        )
+    manage_options = (ConnectionBase.manage_options[1:] +
+                      ({'label': 'Browse', 'action': 'manage_browse'},))
 
     def __init__(self, id, title, connection_string, check, use_unicode=None,
                  charset=None, auto_create_db=None, timeout=None):
@@ -147,7 +145,7 @@ def _getConnection(self):
             self.connect(self.connection_string)
             return self._v_database_connection
 
-    security.declareProtected(use_database_methods,  'connect')  # NOQA: D001
+    security.declareProtected(use_database_methods, 'connect')  # NOQA: D001
 
     def connect(self, conn_string):
         """ Base API. Opens connection to mysql. Raises if problems.

Products/ZMySQLDA/db.py

@@ -158,7 +158,7 @@ def __call__(self, connection):
                 create_query = 'create database %s' % db
                 if self.use_unicode and not self.charset:
                     create_query += ' default character set %s' % (
-                                        self._db_cls.unicode_charset)
+                                    self._db_cls.unicode_charset)
                 elif self.charset:
                     create_query += ' default character set %s' % self.charset
                 connection.query(create_query)
@@ -476,7 +476,7 @@ def columns(self, table_name):
                 if short_type not in ('set', 'enum'):
                     if ',' in size:
                         info['scale'], info['precision'] = map(
-                                int, size.split(',', 1))
+                            int, size.split(',', 1))
                     else:
                         info['scale'] = int(size)
             else:

README.rst

@@ -25,5 +25,7 @@ Compatibility
 
 * ``Zope`` 4 after 4.0beta5 under Python 2.7 and Python 3.5 and higher.
 
+* ``Zope`` 5 under Python 3.6 and higher.
+
 * MySQL versions 3.22 and later including MariaDB. You need version 4.1
   or higher for unicode support.

buildout.cfg

@@ -1,7 +1,6 @@
 [buildout]
 extends =
-    https://zopefoundation.github.io/Zope/releases/4.x/versions-prod.cfg
-    https://zopefoundation.github.io/Zope/releases/4.x/versions.cfg
+    https://zopefoundation.github.io/Zope/releases/master/versions.cfg
 develop = .
 parts =
     test
@@ -10,7 +9,6 @@ parts =
 
 [test]
 recipe = zc.recipe.testrunner
-defaults = ['-cv']
 eggs =
     Products.ZMySQLDA
 

zope2.cfg → buildout2.cfg

@@ -2,10 +2,6 @@
 extends =
     buildout.cfg
     https://raw.githubusercontent.com/zopefoundation/Zope/2.13/version_ranges.cfg
-develop = .
-versions = versions
-parts =
-    test
 
 [versions]
 zc.buildout =

buildout4.cfg

@@ -0,0 +1,4 @@
+[buildout]
+extends =
+    buildout.cfg
+    https://zopefoundation.github.io/Zope/releases/4.x/versions.cfg

setup.cfg

@@ -22,6 +22,8 @@ no-accept-encodings = True
 doctests = True
 exclude =
     bootstrap.py
+ignore =
+    W504  # Line break after binary operator
 htmldir = parts/flake8
 
 [coverage:run]

setup.py

@@ -44,6 +44,7 @@ def read(*rnames):
         'Framework :: Zope2',
         'Framework :: Zope :: 2',
         'Framework :: Zope :: 4',
+        'Framework :: Zope :: 5',
         'License :: OSI Approved :: Zope Public License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
@@ -54,6 +55,7 @@ def read(*rnames):
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: Database',
         'Topic :: Database :: Front-Ends',
@@ -71,6 +73,6 @@ def read(*rnames):
         'mysqlclient;python_version >= "3"',
     ],
     extras_require={
-      'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
-      },
+        'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
+    },
 )

tox.ini

@@ -6,16 +6,19 @@ envlist =
     py36,
     py37,
     py38,
+    py39,
     lint,
     coverage
 
 [testenv]
+# We need to pin setuptools until we have zc.buildout 3.0.
+commands_pre =
+    py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
+    !py27-!py35: {envbindir}/buildout -nc {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
 commands =
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
-    coverage run {envbindir}/test
+    coverage run {envbindir}/test {posargs:-cv}
 deps =
-    setuptools
+    setuptools < 52
     zc.buildout 
     coverage
 skip_install = true
@@ -24,15 +27,16 @@ setenv =
 
 [testenv:py27_zope213]
 basepython = python2.7
+commands_pre =
+    {envbindir}/buildout -nc {toxinidir}/buildout2.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
 commands =
-    {envbindir}/buildout -c {toxinidir}/zope2.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
-    {envbindir}/buildout -c {toxinidir}/zope2.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
-    {envbindir}/test
+    {envbindir}/test {posargs:-cv}
 
 [testenv:coverage]
 basepython = python3.6
-commands =
+commands_pre =
     coverage erase
+commands =
     coverage combine
     coverage html -i
     coverage report
@@ -45,6 +49,7 @@ depends =
     py36,
     py37,
     py38,
+    py39,
 setenv =
     COVERAGE_FILE={toxinidir}/.coverage
 
@@ -67,7 +72,6 @@ deps =
     flake8-deprecated
     flake8-todo
     mccabe
-    flake8-blind-except
     flake8-commas
     flake8-string-format
     flake8-quotes