Pimp package.

.github/workflows/tests.yml

@@ -26,7 +26,7 @@ jobs:
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
-        - ["pypy-3.7", "pypy3"]
+        - ["pypy-3.9", "pypy3"]
         - ["3.9",   "coverage"]
 
     runs-on: ${{ matrix.os[1] }}

.meta.toml

@@ -2,11 +2,10 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "3018c57b"
+commit-id = "d908d56f"
 
 [python]
 with-pypy = true
-with-legacy-python = true
 with-sphinx-doctests = false
 with-macos = false
 with-windows = false

CHANGES.txt → CHANGES.rst

@@ -4,13 +4,9 @@ CHANGES
 4.0 (unreleased)
 ================
 
-- Add support for Python 3.10, 3.11.
+- Add support for Python 3.7, 3.8, 3.9, 3.10, 3.11.
 
-- Drop support for Python 2.7, 3.5, 3.6.
-
-- Add support for Python 3.7, 3.8 and 3.9.
-
-- Drop support for Python 3.4.
+- Drop support for Python 2.7, 3.4, 3.5, 3.6.
 
 - Fix tests to be able to run with ``zope.component >= 5``.
 

README.txt → README.rst

@@ -31,8 +31,8 @@ Getting grok
 ============
 
 The easiest way to get started with grok is to install the
-`grokproject <http://cheeseshop.python.org/pypi/grokproject>`_ package
-(e.g. via ``easy_install grokproject``) and then create a new project
+`grokproject <https://pypi.org/project/grokproject/>`_ package
+(e.g. via ``pip install grokproject``) and then create a new project
 area by calling the ``grokproject`` script like so::
 
   $ grokproject MyProject
@@ -41,8 +41,8 @@ area by calling the ``grokproject`` script like so::
 This will create a project area in ``MyProject`` as well as download
 and install grok.
 
-You can also get grok from the subversion repository::
+You can also get grok from GitHub::
 
-  svn co svn://svn.zope.org/repos/main/grok/trunk grok
+  git clone git@github.com:zopefoundation/grok.git
 
 Then follow the instructions of ``INSTALL.txt``.

setup.cfg

@@ -19,7 +19,7 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
-known_third_party = six, docutils, pkg_resources
+known_third_party = docutils, pkg_resources, pytz
 known_zope =
 known_first_party =
 default_section = ZOPE

setup.py

@@ -7,11 +7,12 @@
 
 
 def read(*rnames):
-    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+    with open(os.path.join(os.path.dirname(__file__), *rnames)) as f:
+        return f.read()
 
 
 long_description = (
-    read('README.txt') + '\n' + read('CHANGES.txt'))
+    read('README.rst') + '\n' + read('CHANGES.rst'))
 
 
 tests_require = [
@@ -29,12 +30,11 @@ def read(*rnames):
     name='grokcore.catalog',
     version='4.0.dev0',
     author='Grok Team',
-    author_email='grok-dev@zope.org',
-    url='http://grok.zope.org',
-    download_url='http://pypi.python.org/pypi/grokcore.catalog',
+    author_email='zope-dev@zope.dev',
+    url='https://github.com/zopefoundation/grokcore.catalog',
     description='Grok-like configuration for catalog and indexes',
     long_description=long_description,
-    license='ZPL',
+    license='ZPL 2.1',
     classifiers=[
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
@@ -57,7 +57,7 @@ def read(*rnames):
     include_package_data=True,
     zip_safe=False,
     install_requires=[
-        'grokcore.component >= 2.5dev',
+        'grokcore.component >= 2.5',
         'grokcore.site >= 1.7',
         'martian >= 0.13',
         'setuptools',
@@ -74,6 +74,5 @@ def read(*rnames):
         'zope.keyreference',
         'zope.site',
     ],
-    tests_require=tests_require,
     extras_require={'test': tests_require},
 )

tox.ini

@@ -14,6 +14,8 @@ envlist =
 
 [testenv]
 usedevelop = true
+package = wheel
+wheel_build_env = .pkg
 deps =
     zope.testrunner
 commands =