Skip to content

Commit

Permalink
- vb and update to newest compatible versions of dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
dataflake committed Jun 15, 2023
1 parent bd390a2 commit 10c1eb4
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 20 deletions.
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ 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.8.4 (unreleased)
------------------

- Update to newest compatible versions of dependencies.


5.8.3 (2023-06-15)
------------------

Expand Down
1 change: 1 addition & 0 deletions buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ parts =
requirements
sources-dir = develop
auto-checkout =
RestrictedPython

[testenv]
PYTHONHASHSEED = random
Expand Down
4 changes: 2 additions & 2 deletions constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ persistent==5.0
pycparser==2.21
python-gettext==5.0
pytz==2023.3
roman==4.0
roman==4.1
six==1.16.0
soupsieve==2.4.1
transaction==3.1.0
Expand Down Expand Up @@ -59,7 +59,7 @@ zope.i18n==5.0
zope.i18nmessageid==6.0.1
zope.interface==6.0
zope.lifecycleevent==4.4
zope.location==4.3
zope.location==5.0
zope.pagetemplate==5.0
zope.processlifetime==3.0
zope.proxy==5.0.0
Expand Down
2 changes: 1 addition & 1 deletion docs/maintenance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Steps for creating a new Zope release
$ git tag -as <TAG-NAME> -m "- tagging release <TAG-NAME>"
$ git push --tags
$ bin/zopepy setup.py egg_info -Db '' sdist bdist_wheel
$ bin/twine upload -s dist/Zope-<TAG-NAME>*
$ bin/twine upload dist/Zope-<TAG-NAME>*

- Update version information in the change log and setup.py::

Expand Down
6 changes: 3 additions & 3 deletions requirements-full.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Zope==5.8.3
-e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope
AccessControl==6.1
Acquisition==5.0
AuthEncoding==5.0
Expand Down Expand Up @@ -26,7 +26,7 @@ persistent==5.0
pycparser==2.21
python-gettext==5.0
pytz==2023.3
roman==4.0
roman==4.1
six==1.16.0
soupsieve==2.4.1
transaction==3.1.0
Expand Down Expand Up @@ -60,7 +60,7 @@ zope.i18n==5.0
zope.i18nmessageid==6.0.1
zope.interface==6.0
zope.lifecycleevent==4.4
zope.location==4.3
zope.location==5.0
zope.pagetemplate==5.0
zope.processlifetime==3.0
zope.proxy==5.0.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.8.3'
version = '5.8.4.dev0'

setup(
name='Zope',
Expand Down
6 changes: 3 additions & 3 deletions 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 = 5.8.3
Zope =
Zope2 = 4.0
AccessControl = 6.1
Acquisition = 5.0
Expand Down Expand Up @@ -30,7 +30,7 @@ pycparser = 2.21
python-gettext = 5.0
pytz = 2023.3
six = 1.16.0
roman = 4.0
roman = 4.1
soupsieve = 2.4.1
transaction = 3.1.0
waitress = 2.1.2
Expand Down Expand Up @@ -63,7 +63,7 @@ zope.i18n = 5.0
zope.i18nmessageid = 6.0.1
zope.interface = 6.0
zope.lifecycleevent = 4.4
zope.location = 4.3
zope.location = 5.0
zope.pagetemplate = 5.0
zope.processlifetime = 3.0
zope.proxy = 5.0.0
Expand Down
17 changes: 7 additions & 10 deletions versions.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ versions = versions
Babel = 2.12.1
Jinja2 = 3.1.2
Missing = 4.2
MarkupSafe = 2.1.2
MarkupSafe = 2.1.3
Products.BTreeFolder2 = 5.1
Products.ZCatalog = 7.0
Pygments = 2.15.1
Record = 4.0
# sphinx-rtd-theme 1.2.0 requires Sphinx<7
# sphinx-rtd-theme 1.2.2 requires Sphinx<7
Sphinx = 6.2.1
alabaster = 0.7.13
certifi = 2023.5.7
charset-normalizer = 3.1.0
collective.recipe.template = 2.2
# sphinx-rtd-theme 1.2.0 requires docutils<19
# sphinx-rtd-theme 1.2.2 requires docutils<19
docutils = 0.18.1
five.localsitemanager = 4.0
idna = 3.4
imagesize = 1.4.1
mr.developer = 2.0.1
packaging = 23.1
plone.recipe.command = 1.1
requests = 2.30.0
requests = 2.31.0
snowballstemmer = 2.2.0
sphinx-rtd-theme = 1.2.0
sphinx-rtd-theme = 1.2.2
sphinxcontrib-applehelp = 1.0.4
sphinxcontrib-devhelp = 1.0.2
sphinxcontrib-htmlhelp = 2.0.1
Expand All @@ -38,10 +38,7 @@ sphinxcontrib-jsmath = 1.0.1
sphinxcontrib-qthelp = 1.0.3
sphinxcontrib-serializinghtml = 1.1.5
tempstorage = 6.0
urllib3 = 2.0.2
# z3c.checkversions 2.0 pins setuptools, which then requires adding a version
# pin for setuptools in Zope, which in turn caused issues in many projects I
# have seen that rely on the Zope version pins.
z3c.checkversions = 1.2
urllib3 = 2.0.3
z3c.checkversions = 2.1
zc.recipe.testrunner = 3.0
zope.testrunner = 6.0

0 comments on commit 10c1eb4

Please sign in to comment.