diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4232ce2..8911d57 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,14 +20,15 @@ jobs: - ubuntu config: # [Python version, tox env] - - ["3.8", "lint"] + - ["3.9", "lint"] - ["2.7", "py27"] - ["3.5", "py35"] - ["3.6", "py36"] - ["3.7", "py37"] - ["3.8", "py38"] - ["3.9", "py39"] - - ["3.8", "coverage"] + - ["3.10", "py310"] + - ["3.9", "coverage"] runs-on: ${{ matrix.os }}-latest name: ${{ matrix.config[1] }} diff --git a/.gitignore b/.gitignore index 689079d..ce7f677 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Generated from: # https://github.com/zopefoundation/meta/tree/master/config/zope-product +*.dll *.egg-info/ *.profraw *.pyc @@ -27,4 +28,5 @@ lib64 log/ parts/ pyvenv.cfg +testing.log var/ diff --git a/.meta.toml b/.meta.toml index 4e05a57..833b133 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,13 +2,14 @@ # https://github.com/zopefoundation/meta/tree/master/config/zope-product [meta] template = "zope-product" -commit-id = "d1cc3112dca7b71f6fbd14b1319e2d39f72aeb1a" +commit-id = "9a5db8c650c45a439db06e3a7b2b86318006659d" [python] with-pypy = false with-legacy-python = true with-sphinx-doctests = false with-windows = false +with-future-python = false [tox] use-flake8 = true diff --git a/CHANGES.rst b/CHANGES.rst index 20055a9..5751cfd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,7 @@ Changelog 3.15 (unreleased) ----------------- +- Add support for Python 3.10. 3.14 (2021-06-29) ----------------- @@ -15,15 +16,15 @@ Changelog 3.13 (2021-03-15) ----------------- -- add support for Python 3.9 +- Add support for Python 3.9. 3.12 (2020-01-09) ----------------- -- Zope 4 ZMI improvements for database connection test form +- Zope 4 ZMI improvements for database connection test form. -- Fix the ``repr`` of SQL Methods +- Fix the ``repr`` of SQL Methods. 3.11 (2020-07-15) @@ -36,31 +37,31 @@ Changelog 3.10 (2020-07-14) ----------------- -- Removed last remnants of the Zope 2 Help System +- Removed last remnants of the Zope 2 Help System. -- Zope 4 ZMI improvements for ZSQL Method objects +- Zope 4 ZMI improvements for ZSQL Method objects. -- Zope 4 ZMI improvements for database connection objects +- Zope 4 ZMI improvements for database connection objects. -- Package and ``tox`` configuration cleanup to allow runing tests in parallel +- Package and ``tox`` configuration cleanup to allow runing tests in parallel. 3.9 (2020-04-16) ---------------- -- Added explicit type selection for ZSQL parameters on the ZMI `Test` tab +- Added explicit type selection for ZSQL parameters on the ZMI `Test` tab. 3.8 (2020-04-15) ---------------- -- Improved usability for the ZMI `Test` tab +- Improved usability for the ZMI `Test` tab. 3.7 (2020-03-19) ---------------- -- Improved error handling and feedback for ``dtml-sqltest`` +- Improved error handling and feedback for ``dtml-sqltest``. 3.6 (2020-02-28) @@ -73,15 +74,15 @@ Changelog 3.5 (2020-02-26) ---------------- -- Fixed up the ZMI `Test` tab +- Fixed up the ZMI `Test` tab. - - Fixed broken batch link display + - Fixed broken batch link display. - - Make number of rows shown configurable + - Make number of rows shown configurable. - - Show total result set size + - Show total result set size. - - Shown warning if the result set size hits the configured limit + - Shown warning if the result set size hits the configured limit. - Fixed incompatibility with ``transaction`` version 3. (`#23 `_) @@ -90,9 +91,9 @@ Changelog 3.4 (2020-02-13) ---------------- -- Fixed ``PUT`` issue that failed due to a WebDAV lock test in ``manage_edit`` +- Fixed ``PUT`` issue that failed due to a WebDAV lock test in ``manage_edit``. -- ``manage_DAVget`` now inserts a vi syntax highlighting hint +- ``manage_DAVget`` now inserts a vi syntax highlighting hint. 3.3 (2020-02-12) @@ -113,19 +114,19 @@ Changelog 3.1 (2020-02-09) ---------------- -- Pull in WebDAV support from Zope and pin Zope to 4.2.1 or higher +- Pull in WebDAV support from Zope and pin Zope to 4.2.1 or higher. 3.0.13 (2020-02-04) ------------------- -- Pin ``DocumentTemplate`` 3.2.2 for less quoting, it is to database-specific +- Pin ``DocumentTemplate`` 3.2.2 for less quoting, it is to database-specific. 3.0.12 (2020-02-03) ------------------- -- Depend on ``DocumentTemplate`` 3.2.1+ to no longer escape ``"`` +- Depend on ``DocumentTemplate`` 3.2.1+ to no longer escape ``"``. 3.0.11 (2020-01-31) @@ -137,45 +138,45 @@ Changelog 3.0.10 (2020-01-29) ------------------- -- remove Zope Help System fossils so the product works with Zope 5 +- Remove Zope Help System fossils so the product works with Zope 5. 3.0.9 (2019-11-22) ------------------ -- fix ImportError under Zope 5 due to moved dependencies +- Fix ImportError under Zope 5 due to moved dependencies (`#19 `_) 3.0.8 (2019-08-05) ------------------ -- show rendered SQL output even if an exception occurred +- Show rendered SQL output even if an exception occurred (`#15 `_) -- fix sqltest behavior with bytes inputs +- Fix sqltest behavior with bytes inputs (`#14 `_) 3.0.7 (2019-04-26) ------------------ -- compatibility fixes for better unicode support in DocumentTemplate +- Compatibility fixes for better unicode support in DocumentTemplate. 3.0.6 (2019-04-03) ------------------ -- fix failing unpickling of older Z SQL Methods instances +- Fix failing unpickling of older Z SQL Methods instances (`#12 `_) -- improve usability and add Zope 4 compatibility for connection forms +- Improve usability and add Zope 4 compatibility for connection forms. -- improve general usability of the ZSQL Method edit and test forms +- Improve general usability of the ZSQL Method edit and test forms. -- enable the fancy editor for the ZSQL Method edit form +- Enable the fancy editor for the ZSQL Method edit form. -- sanitize ``tox`` and ``flake8`` configurations, reach ``flake8`` compliance +- Sanitize ``tox`` and ``flake8`` configurations, reach ``flake8`` compliance. 3.0.5 (2019-03-29) @@ -191,7 +192,7 @@ Changelog - Specify supported Python versions using ``python_requires`` in setup.py (`Zope#481 `_) -- Added support for Python 3.7 and 3.8 +- Added support for Python 3.7 and 3.8. 3.0.3 (2018-06-11) @@ -200,17 +201,17 @@ Changelog - Fix long-standing bug of setting an ``int`` as return value for the transaction manager's ``sortKey`` method. It must be a string. -- PEP-8 compliance +- PEP-8 compliance. -- clean out all ``install_requires`` that are already required by ``Zope`` +- Clean out all ``install_requires`` that are already required by ``Zope``. -- only claim to support Python versions supported by Zope itself +- Only claim to support Python versions supported by Zope itself. 3.0.2 (2018-03-16) ------------------ -- Add flake8 code checking +- Add flake8 code checking. - Add test coverage computation. @@ -228,9 +229,9 @@ Changelog 3.0.0 (2017-05-23) ------------------ -- added tox configuration +- Added tox configuration. -- Python 3 compatibility +- Python 3 compatibility. 3.0.0b1 (2017-05-03) @@ -238,7 +239,7 @@ Changelog - Target use with Zope 4: no longer support 2.13.x. -- Make webdav from ZServer optional +- Make webdav from ZServer optional. [dataflake] 2.13.5 (2016-11-10) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..b5c34d4 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,23 @@ + +# Contributing to zopefoundation projects + +The projects under the zopefoundation GitHub organization are open source and +welcome contributions in different forms: + +* bug reports +* code improvements and bug fixes +* documentation improvements +* pull request reviews + +For any changes in the repository besides trivial typo fixes you are required +to sign the contributor agreement. See +https://www.zope.dev/developer/becoming-a-committer.html for details. + +Please visit our [Developer +Guidelines](https://www.zope.dev/developer/guidelines.html) if you'd like to +contribute code changes and our [guidelines for reporting +bugs](https://www.zope.dev/developer/reporting-bugs.html) if you want to file a +bug report. diff --git a/MANIFEST.in b/MANIFEST.in index 9701313..66435ce 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,8 @@ # Generated from: # https://github.com/zopefoundation/meta/tree/master/config/zope-product +include *.md include *.rst +include *.txt include buildout.cfg include tox.ini diff --git a/setup.py b/setup.py index 7e7edec..b064b0d 100644 --- a/setup.py +++ b/setup.py @@ -57,6 +57,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: Implementation :: CPython', 'Topic :: Database', 'Topic :: Database :: Front-Ends', diff --git a/tox.ini b/tox.ini index eaba4df..a919708 100644 --- a/tox.ini +++ b/tox.ini @@ -10,14 +10,14 @@ envlist = py37 py38 py39 + py310 coverage [testenv] skip_install = true -# We need to pin setuptools until we have zc.buildout 3.0. deps = - setuptools < 52 - zc.buildout + zc.buildout >= 3.0.0rc3 + wheel > 0.37 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 @@ -32,7 +32,7 @@ allowlist_externals = mkdir commands = isort --check-only --diff {toxinidir}/src {toxinidir}/setup.py - - flake8 --format=html {toxinidir}/src {toxinidir}/setup.py + - flake8 {toxinidir}/src {toxinidir}/setup.py flake8 {toxinidir}/src {toxinidir}/setup.py check-manifest check-python-versions @@ -41,8 +41,6 @@ deps = check-python-versions flake8 isort - # helper to generate HTML reports: - flake8-html # Useful flake8 plugins that are Python and Plone specific: flake8-coding flake8-debugger