Merge bfef307 into 6e5b3c2

zopefoundation · Apr 12, 2022 · 13158d4 · 13158d4
2 parents 6e5b3c2 + bfef307
commit 13158d4
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 23 deletions.
diff --git 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
@@ -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
@@ -2,13 +2,14 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "beb954160d2539dd10e013a553a0af8d48002e0a"
+commit-id = "9a5db8c650c45a439db06e3a7b2b86318006659d"
 
 [python]
 with-pypy = false
 with-legacy-python = true
 with-sphinx-doctests = false
 with-windows = false
+with-future-python = false
 
 [coverage]
 fail-under = 75

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,45 +4,46 @@ Changelog
 4.14 (unreleased)
 -----------------
 
+- Add support for Python 3.10.
 
 4.13 (2021-07-02)
 -----------------
 
-- make sure "Manager" users can always modify proxy roles
+- Make sure "Manager" users can always modify proxy roles
   (`#50 <https://github.com/zopefoundation/Products.PythonScripts/issues/50>`_)
 
-- add support for Python 3.9
+- Add support for Python 3.9.
 
-- update configuration for version 5 of ``isort``
+- Update configuration for version 5 of ``isort``.
 
 
 4.12 (2020-06-03)
 -----------------
 
-- add a ``file`` parameter to factory function ``manage_addPythonScript``
+- Add a ``file`` parameter to factory function ``manage_addPythonScript``
   (`#45 <https://github.com/zopefoundation/Products.PythonScripts/issues/45>`_)
 
-- fix ``TypeError`` when updating an existing script from a file
+- Fix ``TypeError`` when updating an existing script from a file
   (`#43 <https://github.com/zopefoundation/Products.PythonScripts/issues/43>`_)
 
 
 4.11 (2020-02-11)
 -----------------
 
-- fix ``PUT`` issues with string encoding
+- Fix ``PUT`` issues with string encoding.
 
 
 4.10 (2020-02-11)
 -----------------
 
-- override ``manage_DAVget`` to get correct editable sources
+- Override ``manage_DAVget`` to get correct editable sources
   (`#40 <https://github.com/zopefoundation/Products.PythonScripts/issues/40>`_)
 
 
 4.9 (2019-10-09)
 ----------------
 
-- prevent ResourceWarning/Error by closing default contents file
+- Prevent ResourceWarning/Error by closing default contents file
   (`#39 <https://github.com/zopefoundation/Products.PythonScripts/issues/39>`_)
 
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,23 @@
+<!--
+Generated from:
+https://github.com/zopefoundation/meta/tree/master/config/zope-product
+--> 
+# 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
@@ -1,5 +1,6 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
+include *.md
 include *.rst
 include *.txt
 include buildout.cfg

diff --git a/README.rst b/README.rst
@@ -1,5 +1,5 @@
-.. image:: https://travis-ci.com/zopefoundation/Products.PythonScripts.svg?branch=master
-   :target: https://travis-ci.com/zopefoundation/Products.PythonScripts
+.. image:: https://github.com/zopefoundation/Products.PythonScripts/actions/workflows/tests.yml/badge.svg
+   :target: https://github.com/zopefoundation/Products.PythonScripts/actions/workflows/tests.yml
 
 .. image:: https://coveralls.io/repos/github/zopefoundation/Products.PythonScripts/badge.svg?branch=master
    :target: https://coveralls.io/github/zopefoundation/Products.PythonScripts?branch=master
@@ -39,18 +39,18 @@ the risk of abuse.
 
 The easiest way to make modules available to Python scripts on
 your site is to create a new directory in your Products directory
-containing an `__init__.py` file. At Zope startup time, this
+containing an ``__init__.py`` file. At Zope startup time, this
 "product" will be imported, and any module assertions you make
-in the `__init__.py` will take effect. Here's how to do it:
+in the ``__init__.py`` will take effect. Here's how to do it:
 
 - In your Products directory (either in lib/python of your
   Zope installation or in the root of your Zope install,
   depending on your deployment model), create a new directory
   with a name like "GlobalModules".
 
-- In the new directory, create a file named `__init__.py`.
+- In the new directory, create a file named ``__init__.py``.
 
-- Edit the `__init__.py` file, and add calls to the 'allow_module'
+- Edit the ``__init__.py`` file, and add calls to the 'allow_module'
   function (located in the Products.PythonScripts.Utility module),
   passing the names of modules to be enabled for use by scripts.
   For example::

diff --git a/setup.py b/setup.py
@@ -51,6 +51,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',
       ],
       python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',

diff --git 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