Skip to content

Commit

Permalink
- prepare Zope 5.12
Browse files Browse the repository at this point in the history
  • Loading branch information
dataflake committed Jan 17, 2025
1 parent b140341 commit 5f3167e
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 = "210c1a0c"
commit-id = "6858ecfc"

[python]
with-pypy = false
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/zopefoundation/Zope/pull/396>`_)
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
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
Expand Down
1 change: 1 addition & 0 deletions constraints.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Zope==5.12
AccessControl==7.2
Acquisition==6.1
AuthEncoding==5.0
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion requirements-full.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion versions-prod.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5f3167e

Please sign in to comment.