Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
#
# EditorConfig Configuration file, for more details see:
# http://EditorConfig.org
# https://EditorConfig.org
# EditorConfig is a convention description, that could be interpreted
# by multiple editors to enforce common coding conventions for specific
# file types
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
name: linting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v5
- uses: actions/setup-python@v6
with:
python-version: 3.x
python-version: '3.13'
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd #v3.0.1
with:
extra_args: --all-files --show-diff-on-failure
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,29 @@ jobs:
config:
# [Python version, tox env]
- ["3.11", "release-check"]
- ["3.9", "py39"]
- ["3.10", "py310"]
- ["3.11", "py311"]
- ["3.12", "py312"]
- ["3.13", "py313"]
- ["3.14", "py314"]
- ["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.config[1] }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
persist-credentials: false
- name: Install uv + caching
uses: astral-sh/setup-uv@v5
# astral/setup-uv@7.1.3
uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3
with:
enable-cache: true
cache-dependency-glob: |
setup.*
tox.ini
python-version: ${{ matrix.matrix.config[0] }}
python-version: ${{ matrix.config[0] }}
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Test
if: ${{ !startsWith(runner.os, 'Mac') }}
Expand Down
2 changes: 1 addition & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
[meta]
template = "zope-product"
commit-id = "a0de4e93"
commit-id = "9fcd3d67"

[python]
with-pypy = false
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
minimum_pre_commit_version: '3.6'
repos:
- repo: https://github.com/pycqa/isort
rev: "6.0.1"
rev: "7.0.0"
hooks:
- id: isort
- repo: https://github.com/hhatto/autopep8
Expand All @@ -12,16 +12,16 @@ repos:
- id: autopep8
args: [--in-place, --aggressive, --aggressive]
- repo: https://github.com/asottile/pyupgrade
rev: v3.19.1
rev: v3.21.0
hooks:
- id: pyupgrade
args: [--py39-plus]
args: [--py310-plus]
- repo: https://github.com/isidentical/teyit
rev: 0.4.3
hooks:
- id: teyit
- repo: https://github.com/PyCQA/flake8
rev: "7.1.2"
rev: "7.3.0"
hooks:
- id: flake8
additional_dependencies:
Expand Down
6 changes: 5 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ Changelog
5.2 (unreleased)
----------------

- Switch to PEP 420 native namespace.

- Add support for Python 3.14.

- Drop support for Python 3.8 and 3.9.

- Drop support for Python 3.8.

5.1 (2024-10-16)
----------------
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[build-system]
requires = [
"setuptools == 75.8.2",
"setuptools >= 78.1.1,< 81",
"wheel",
]
build-backend = "setuptools.build_meta"
Expand Down
12 changes: 3 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#
##############################################################################

from setuptools import find_packages
from setuptools import setup


Expand All @@ -32,9 +31,6 @@
author_email='zope-dev@zope.dev',
long_description=('{}\n{}'.format(open('README.rst').read(),
open('CHANGES.rst').read())),
packages=find_packages('src'),
namespace_packages=['Products'],
package_dir={'': 'src'},
classifiers=[
'Development Status :: 6 - Mature',
'Environment :: Web Environment',
Expand All @@ -44,16 +40,15 @@
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Programming Language :: Python :: 3.14',
'Programming Language :: Python :: Implementation :: CPython',
],
python_requires='>=3.9',
python_requires='>=3.10',
install_requires=[
'setuptools',
'AccessControl',
'Acquisition',
'DateTime',
Expand All @@ -62,11 +57,10 @@
'zExceptions',
'Zope >= 4.1.2',
],
include_package_data=True,
zip_safe=False,
entry_points={
'zodbupdate.decode': [
'decodes = Products.PythonScripts:zodbupdate_decode_dict',
],
},
include_package_data=True,
)
2 changes: 1 addition & 1 deletion src/Products/PythonScripts/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def initialize(context):
icon='www/pyscript.gif',
)

global _m
global _m # noqa: F824
_m['recompile'] = recompile
_m['recompile__roles__'] = ('Manager',)

Expand Down
1 change: 0 additions & 1 deletion src/Products/__init__.py

This file was deleted.

8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ minversion = 3.18
envlist =
release-check
lint
py39
py310
py311
py312
py313
py314
coverage

[testenv]
skip_install = true
deps =
setuptools == 75.8.2
setuptools >= 78.1.1,< 81
zc.buildout
wheel
setenv =
Expand All @@ -37,7 +37,7 @@ description = ensure that the distribution is ready to release
basepython = python3
skip_install = true
deps =
setuptools == 75.8.2
setuptools >= 78.1.1,< 81
wheel
twine
build
Expand All @@ -47,7 +47,7 @@ deps =
commands_pre =
commands =
check-manifest
check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml
check-python-versions --only pyproject.toml,setup.py,tox.ini,.github/workflows/tests.yml
python -m build --sdist --no-isolation
twine check dist/*

Expand Down
Loading