Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

plone 6.1.0 #121

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM plone/plone-backend:6.0.10.1
FROM plone/plone-backend:6.1.0
COPY docker/create-constraints.py docker/constraints.cfg docker/requirements.txt /app/
COPY versions.cfg /
RUN pip install -r https://dist.plone.org/release/6.0.10.1/requirements.txt ${PIP_PARAMS} && \
RUN pip install -r https://dist.plone.org/release/6.1.0/requirements.txt ${PIP_PARAMS} && \
python create-constraints.py constraints.cfg constraints.txt && \
./bin/pip install --ignore-requires-python -r requirements.txt -c constraints.txt ${PIP_PARAMS} && \
find /app/lib -name LC_MESSAGES -exec chown -R plone:plone {} \;
4 changes: 2 additions & 2 deletions Dockerfile.acceptance
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM plone/server-acceptance:6.0.10.1
FROM plone/server-acceptance:6.1.0
COPY docker/create-constraints.py docker/*.cfg docker/*.txt /app/
COPY versions.cfg /
RUN pip install -r https://dist.plone.org/release/6.0.10.1/requirements.txt ${PIP_PARAMS} && \
RUN pip install -r https://dist.plone.org/release/6.1.0/requirements.txt ${PIP_PARAMS} && \
python create-constraints.py constraints.cfg constraints.txt && \
./bin/pip install --ignore-requires-python -r requirements-acceptance.txt -c constraints.txt ${PIP_PARAMS} && \
find /app/lib -name LC_MESSAGES -exec chown -R plone:plone {} \;
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.development
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM plone/plone-backend:6.0.10.1
FROM plone/plone-backend:6.1.0
COPY docker/create-constraints.py docker/constraints.cfg docker/requirements.txt requirements-development.txt mx.ini /app/


COPY versions.cfg /

RUN pip install -r https://dist.plone.org/release/6.0.10.1/requirements.txt ${PIP_PARAMS} && \
RUN pip install -r https://dist.plone.org/release/6.1.0/requirements.txt ${PIP_PARAMS} && \
python create-constraints.py constraints.cfg constraints.txt && \
./bin/pip install mxdev && \
./bin/mxdev -c mx.ini && \
Expand Down
8 changes: 8 additions & 0 deletions docker/create-constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@
# Note: this works like a dictionary, but is a class 'zc.buildout.buildout.Options'.
versions = config.versions

# remove duplicated entries
uniq = {}
for (package, version) in versions.items():
if package.lower() in uniq and version.split(".") < uniq[package.lower()].split("."):
continue
uniq[package.lower()] = version
versions = uniq

with open(constraints_file, "w") as cfile:
cfile.write("# File created by {}\n".format(__file__))
cfile.write("# Constraints parsed from {}\n".format(config_file))
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-r https://dist.plone.org/release/6.0.13/requirements.txt
-r https://dist.plone.org/release/6.1.0/requirements.txt
9 changes: 5 additions & 4 deletions versions.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[buildout]
extends =
https://dist.plone.org/release/6.0.14/versions.cfg
https://dist.plone.org/release/6.0.14/versions-ecosystem.cfg
https://dist.plone.org/release/6.0.14/versions-extra.cfg
https://dist.plone.org/release/6.1.0/versions.cfg
https://dist.plone.org/release/6.1.0/versions-ecosystem.cfg
https://dist.plone.org/release/6.1.0/versions-extra.cfg

[iocomune]
version = __CURRENT_VERSION__
Expand All @@ -19,7 +19,7 @@ version = __CURRENT_VERSION__

[versions]
# verify during plone version update
grpcio-tools=1.66.2
Products.validation = 3.0.1

# plone missing
plone.patternslib = 1.3.0
Expand Down Expand Up @@ -98,6 +98,7 @@ design.plone.iocittadino = 1.1.5
Brotli = 1.0.9
cssselect2 = 0.7.0
fonttools = 4.39.3
grpcio-tools=1.66.2
html5lib = 1.1
isodate = 0.6.1
pdfkit = 1.0.0
Expand Down
Loading