Skip to content

Commit

Permalink
Pin down setuptools and more-itertools for Python 2
Browse files Browse the repository at this point in the history
setuptools and more-itertools need to be pinned down for python2
buildouts to a version that has still python2 support.
  • Loading branch information
jone committed Jan 13, 2020
1 parent 96b3131 commit e99429a
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 1 deletion.
2 changes: 1 addition & 1 deletion test-plone-5.2.x-py37.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extends =
https://dist.plone.org/release/5.2-latest/versions.cfg
https://raw.githubusercontent.com/4teamwork/ftw-buildouts/master/test-package.cfg
https://raw.githubusercontent.com/4teamwork/ftw-buildouts/master/test-versions.cfg
https://raw.githubusercontent.com/4teamwork/ftw-buildouts/master/test-versions-plone-5.cfg
https://raw.githubusercontent.com/4teamwork/ftw-buildouts/master/test-versions-plone-5-py37.cfg

jenkins_python = $PYTHON37

Expand Down
4 changes: 4 additions & 0 deletions test-versions-plone-4.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ plone.app.multilingual = <2a
# path.py==11.2.0 has started using importlib_metadata, which does not work well
# with buildout.
path.py = <11.2a

# Python 2 compatibility versions (where newer versions drop Python 2 support).
setuptools = <45.0
more-itertools = <6.0.0
16 changes: 16 additions & 0 deletions test-versions-plone-5-py37.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Plone 5.x version pinnings.
# This file contains suggested version pinnings as constraints.
# These version pinnings take effect when a project does not pin
# versions at all.

[versions]
collective.z3cform.datagridfield = >=1.4

# Constrain to PAM compatible with Plone 5.1. Once Plone 5.2 final is released,
# we should probably split up this file into 5.1/5.2.
plone.app.multilingual = >5a,<5.4

# path.py==12.0.1 has dropped Python 2.7 support.

This comment has been minimized.

Copy link
@djowett-ftw

djowett-ftw Jun 17, 2020

Contributor

@jone just saw this - would you agree that PAM shouldn't be pinned down in Plone 5.2+? (which is all this file applies to).. Also line 13 is not relevant and a bit confusing.
I suggest we delete all 5 lines?

# path.py==11.2.0 has started using importlib_metadata, which does not work well
# with buildout.
path.py = <11.2a
4 changes: 4 additions & 0 deletions test-versions-plone-5.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ plone.app.multilingual = >5a,<5.4
# path.py==11.2.0 has started using importlib_metadata, which does not work well
# with buildout.
path.py = <11.2a

# Python 2 compatibility versions (where newer versions drop Python 2 support).
setuptools = <45.0
more-itertools = <6.0.0

0 comments on commit e99429a

Please sign in to comment.