- Apply the latest zope.meta templates

Author: dataflake

.github/workflows/pre-commit.yml

@@ -0,0 +1,36 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches:
+    - master
+  # Allow to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+env:
+  FORCE_COLOR: 1
+
+jobs:
+  pre-commit:
+    permissions:
+      contents: read
+      pull-requests: write
+    name: linting
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v5
+    - uses: actions/setup-python@v6
+      with:
+        python-version: 3.x
+    - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd  #v3.0.1
+      with:
+        extra_args: --all-files --show-diff-on-failure
+      env:
+        PRE_COMMIT_COLOR: always
+    - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43  #v1.1.0
+      if: always()
+      with:
+        msg: Apply pre-commit code formatting

.github/workflows/tests.yml

@@ -12,60 +12,58 @@ on:
 
 jobs:
   build:
+    permissions:
+      contents: read
+      pull-requests: write
     strategy:
       # We want to see all failures:
       fail-fast: false
       matrix:
         os:
-        - ["ubuntu", "ubuntu-20.04"]
+        - ["ubuntu", "ubuntu-latest"]
         - ["windows", "windows-latest"]
         config:
         # [Python version, tox env]
-        - ["3.9",   "release-check"]
-        - ["3.9",   "lint"]
-        - ["3.7",   "py37"]
-        - ["3.8",   "py38"]
-        - ["3.9",   "py39"]
-        - ["3.10",  "py310"]
-        - ["3.11",  "py311"]
-        - ["3.12",  "py312"]
-        - ["pypy-3.10", "pypy3"]
-        - ["3.9",   "docs"]
-        - ["3.9",   "coverage"]
+        - ["3.11", "release-check"]
+        - ["3.9", "py39"]
+        - ["3.10", "py310"]
+        - ["3.11", "py311"]
+        - ["3.12", "py312"]
+        - ["3.13", "py313"]
+        - ["pypy-3.11", "pypy3"]
+        - ["3.11", "docs"]
+        - ["3.11", "coverage"]
         - ["3.10",   "py310-pure"]
         exclude:
-          - { os: ["windows", "windows-latest"], config: ["3.9",   "release-check"] }
-          - { os: ["windows", "windows-latest"], config: ["3.9",   "lint"] }
-          - { os: ["windows", "windows-latest"], config: ["3.9",   "docs"] }
-          - { os: ["windows", "windows-latest"], config: ["3.9",   "coverage"] }
+          - { os: ["windows", "windows-latest"], config: ["3.11", "release-check"] }
+          - { os: ["windows", "windows-latest"], config: ["3.11", "docs"] }
+          - { os: ["windows", "windows-latest"], config: ["3.11", "coverage"] }
 
     runs-on: ${{ matrix.os[1] }}
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: ${{ matrix.os[0] }}-${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
+    - uses: actions/checkout@v5
       with:
-        python-version: ${{ matrix.config[0] }}
-    - name: Pip cache
-      uses: actions/cache@v4
+        persist-credentials: false
+    - name: Install uv + caching
+      uses: astral-sh/setup-uv@v6
       with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.config[0] }}-
-          ${{ runner.os }}-pip-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install tox
+        enable-cache: true
+        cache-dependency-glob: |
+          setup.*
+          tox.ini
+        python-version: ${{ matrix.matrix.config[0] }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Test
-      run: tox -e ${{ matrix.config[1] }}
+      if: ${{ !startsWith(runner.os, 'Mac') }}
+      run: uvx --with tox-uv tox -e ${{ matrix.config[1] }}
+    - name: Test (macOS)
+      if: ${{ startsWith(runner.os, 'Mac') }}
+      run: uvx --with tox-uv tox -e ${{ matrix.config[1] }}-universal2
     - name: Coverage
       if: matrix.config[1] == 'coverage'
       run: |
-        pip install coveralls
-        coveralls --service=github
+        uvx coveralls --service=github
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.meta.toml

@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "1404d28b"
+commit-id = "b3663390"
 
 [python]
 with-windows = true
@@ -70,3 +70,6 @@ additional-ignores = [
 additional-config = [
     "- [\"3.10\",   \"py310-pure\"]",
     ]
+
+[pre-commit]
+teyit-exclude = "docs/articles/old-guide"

.pre-commit-config.yaml

@@ -0,0 +1,29 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/pure-python
+minimum_pre_commit_version: '3.6'
+repos:
+  - repo: https://github.com/pycqa/isort
+    rev: "6.0.1"
+    hooks:
+    - id: isort
+  - repo: https://github.com/hhatto/autopep8
+    rev: "v2.3.2"
+    hooks:
+    - id: autopep8
+      args: [--in-place, --aggressive, --aggressive]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.20.0
+    hooks:
+    - id: pyupgrade
+      args: [--py39-plus]
+  - repo: https://github.com/isidentical/teyit
+    rev: 0.4.3
+    hooks:
+    - id: teyit
+      exclude: docs/articles/old-guide
+  - repo: https://github.com/PyCQA/flake8
+    rev: "7.3.0"
+    hooks:
+    - id: flake8
+      additional_dependencies:
+        - flake8-debugger == 4.1.2

CHANGES.rst

@@ -2,8 +2,12 @@
  Change History
 ================
 
-6.0.2 (unreleased)
-==================
+6.1 (unreleased)
+================
+
+- Add support for Python 3.13.
+
+- Drop support for Python 3.7 and 3.8.
 
 
 6.0.1 (2025-04-13)

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 <!--
 Generated from:
 https://github.com/zopefoundation/meta/tree/master/config/pure-python
---> 
+-->
 # Contributing to zopefoundation projects
 
 The projects under the zopefoundation GitHub organization are open source and

MANIFEST.in

@@ -5,6 +5,7 @@ include *.rst
 include *.txt
 include buildout.cfg
 include tox.ini
+include .pre-commit-config.yaml
 
 recursive-include docs *.py
 recursive-include docs *.rst

docs/articles/old-guide/chatter.py

@@ -1,13 +1,16 @@
-
-import sys, time, os, random
+import os
+import random
+import sys
+import time
 
 import transaction
+from BTrees import OOBTree
 from persistent import Persistent
-
 from ZEO import ClientStorage
+
 import ZODB
 from ZODB.POSException import ConflictError
-from BTrees import OOBTree
+
 
 class ChatSession(Persistent):
 
@@ -32,7 +35,6 @@ def __init__(self, name):
         # Internal attribute: _messages holds all the chat messages.
         self._messages = OOBTree.OOBTree()
 
-
     def new_messages(self):
         "Return new messages."
 
@@ -46,7 +48,7 @@ def new_messages(self):
 
         for T2, message in self._messages.items():
             if T2 > T:
-                new.append( message )
+                new.append(message)
                 self._v_last_time = T2
 
         return new
@@ -59,7 +61,7 @@ def add_message(self, message):
         while 1:
             try:
                 now = time.time()
-                self._messages[ now ] = message
+                self._messages[now] = message
                 transaction.commit()
             except ConflictError:
                 # Conflict occurred; this process should abort,
@@ -72,6 +74,7 @@ def add_message(self, message):
                 break
         # end while
 
+
 def get_chat_session(conn, channelname):
     """Return the chat session for a given channel, creating the session
     if required."""
@@ -81,20 +84,20 @@ def get_chat_session(conn, channelname):
     # the key 'chat_sessions'.
     root = conn.root()
     if not root.has_key('chat_sessions'):
-        print 'Creating chat_sessions B-tree'
+        print 'Creating chat_sessions B-tree'  # NOQA: E999 print statement
         root['chat_sessions'] = OOBTree.OOBTree()
         transaction.commit()
 
     sessions = root['chat_sessions']
 
     # Get a session object corresponding to the channel name, creating
     # it if necessary.
-    if not sessions.has_key( channelname ):
+    if not sessions.has_key(channelname):
         print 'Creating new session:', channelname
-        sessions[ channelname ] = ChatSession(channelname)
+        sessions[channelname] = ChatSession(channelname)
         transaction.commit()
 
-    session = sessions[ channelname ]
+    session = sessions[channelname]
     return session
 
 
@@ -103,8 +106,8 @@ def get_chat_session(conn, channelname):
         print 'Usage: %s <channelname>' % sys.argv[0]
         sys.exit(0)
 
-    storage = ClientStorage.ClientStorage( ('localhost', 9672) )
-    db = ZODB.DB( storage )
+    storage = ClientStorage.ClientStorage(('localhost', 9672))
+    db = ZODB.DB(storage)
     conn = db.open()
 
     s = session = get_chat_session(conn, sys.argv[1])
@@ -114,12 +117,12 @@ def get_chat_session(conn, channelname):
     while 1:
         # Send a random message
         msg = random.choice(messages)
-        session.add_message( '%s: pid %i' % (msg,os.getpid() ))
+        session.add_message('%s: pid %i' % (msg, os.getpid()))
 
         # Display new messages
         for msg in session.new_messages():
             print msg
 
         # Wait for a few seconds
-        pause = random.randint( 1, 4 )
-        time.sleep( pause )
+        pause = random.randint(1, 4)
+        time.sleep(pause)

docs/articles/old-guide/convert_zodb_guide.py

@@ -1,18 +1,19 @@
 # Use the python docs converter to convert to rst
 # Requires http://svn.python.org/projects/doctools/converter
 
-from converter import restwriter, convert_file
-
-import sys
 import os
+import sys
+
+from converter import convert_file
+from converter import restwriter
 
 
 if __name__ == '__main__':
     try:
         rootdir = sys.argv[1]
         destdir = os.path.abspath(sys.argv[2])
     except IndexError:
-        print "usage: convert.py docrootdir destdir"
+        print "usage: convert.py docrootdir destdir"  # NOQA: E999 print
         sys.exit()
 
     os.chdir(rootdir)
@@ -27,4 +28,4 @@ def get(self, a, b=None):
 
     for infile in os.listdir('.'):
         if infile.endswith('.tex'):
-            convert_file(infile, os.path.join(destdir, infile[:-3]+'rst'))
+            convert_file(infile, os.path.join(destdir, infile[:-3] + 'rst'))