diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index eb4f0c64b5..fd21150beb 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -27,7 +27,7 @@ jobs: extra_args: --all-files --show-diff-on-failure env: PRE_COMMIT_COLOR: always - - uses: pre-commit-ci/lite-action@v1.0.2 + - uses: pre-commit-ci/lite-action@v1.1.0 if: always() with: msg: Apply pre-commit code formatting diff --git a/.meta.toml b/.meta.toml index 5036989b5d..c5f146c4bc 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/zope-product [meta] template = "zope-product" -commit-id = "210c1a0c" +commit-id = "6858ecfc" [python] with-pypy = false diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 52c1ca2a0c..90c76ad2cf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: autopep8 args: [--in-place, --aggressive, --aggressive] - repo: https://github.com/asottile/pyupgrade - rev: v3.17.0 + rev: v3.19.1 hooks: - id: pyupgrade args: [--py38-plus] diff --git a/CHANGES.rst b/CHANGES.rst index 9cb289092c..a3cbe52813 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,8 +7,8 @@ since the branch point at Zope 4.1.2. The change log for the previous version, Zope 4, is at https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst -5.11.2 (unreleased) -------------------- +5.12 (2024-01-17) +----------------- - Enable ZMI History tab for ``OFS.Image.File``. (`#396 `_) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b5c34d4123..ce446a625f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ +--> # Contributing to zopefoundation projects The projects under the zopefoundation GitHub organization are open source and diff --git a/constraints.txt b/constraints.txt index aa7ed0412b..22b1da6b7e 100644 --- a/constraints.txt +++ b/constraints.txt @@ -1,3 +1,4 @@ +Zope==5.12 AccessControl==7.2 Acquisition==6.1 AuthEncoding==5.0 diff --git a/docs/conf.py b/docs/conf.py index de44f69ce2..f1d9061119 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -25,9 +25,9 @@ author = 'The Zope developer community' # The short X.Y version -version = '5.11.1' +version = '5.12' # The full version, including alpha/beta/rc tags -release = '5.11.1' +release = '5.12' # -- General configuration --------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index 5a0b170000..785d3acb26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ # https://github.com/zopefoundation/meta/tree/master/config/zope-product [build-system] -requires = ["setuptools < 74"] +requires = ["setuptools <= 75.6.0"] build-backend = "setuptools.build_meta" [tool.coverage.run] diff --git a/requirements-full.txt b/requirements-full.txt index 15bf3dc9b3..ca21a03c65 100644 --- a/requirements-full.txt +++ b/requirements-full.txt @@ -1,4 +1,4 @@ --e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope +Zope==5.12 AccessControl==7.2 Acquisition==6.1 AuthEncoding==5.0 diff --git a/setup.py b/setup.py index 6284b39d66..7e7a15450e 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def _read_file(filename): README = _read_file('README.rst') CHANGES = _read_file('CHANGES.rst') -version = '5.11.2.dev0' +version = '5.12' setup( name='Zope', diff --git a/tox.ini b/tox.ini index 4a4eadaa1a..828ae1e779 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ envlist = [testenv] skip_install = true deps = - setuptools < 74 + setuptools <= 75.6.0 zc.buildout >= 3.1 wheel > 0.37 cffi >= 1.17.0rc1 @@ -77,7 +77,7 @@ description = ensure that the distribution is ready to release basepython = python3 skip_install = true deps = - setuptools < 74 + setuptools <= 75.6.0 twine build check-manifest diff --git a/versions-prod.cfg b/versions-prod.cfg index 3d6d921fc0..3464f2a3ac 100644 --- a/versions-prod.cfg +++ b/versions-prod.cfg @@ -2,7 +2,7 @@ # Version pins for required and commonly used dependencies. [versions] -Zope = +Zope = 5.12 Zope2 = 4.0 AccessControl = 7.2 Acquisition = 6.1