Skip to content

Dms 1204/no prod branch #20

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.

Sign up for GitHub

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

Merged
sgeulette merged 2 commits into from
Jun 2, 2026
Merged

Dms 1204/no prod branch #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f26762
DMS-1204 base files
sgeulette Jun 1, 2026
fa3aa68
Separated buildout-main in dev and prod
sgeulette Jun 1, 2026
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
8 changes: 7 additions & 1 deletion CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
Changelog
=========

3.1.4 (unreleased)
3.1.5 (unreleased)
------------------

- Refactored buildout to handle dev by default and kept buildout-main for prod. buildout.cfg is written by puppet with this last one.
[sgeulette]
Comment on lines +7 to +8

@coderabbitai coderabbitai Bot Jun 1, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Clarify release-note wording for production path.

Line 7 is hard to parse (“with this last one”). Rephrase to explicitly say puppet writes buildout.cfg to target buildout-main.cfg in production.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@CHANGES.txt` around lines 7 - 8, The release note sentence in CHANGES.txt is
unclear; update the sentence that currently reads "Refactored buildout to handle
dev by default and kept buildout-main for prod. buildout.cfg is written by
puppet with this last one." to explicitly state the production behavior: reword
it to say that puppet writes buildout.cfg to target buildout-main.cfg in
production and that buildout now defaults to dev while buildout-main is kept for
prod (refer to the CHANGES.txt entry and the terms "buildout-main" and
"buildout.cfg" to locate the text).


3.1.4 (2026-05-29)
------------------

- Upgraded collective.classification.folder 1.3.0
Expand Down
9 changes: 9 additions & 0 deletions buildout-main-dev.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[buildout]
# Add the config name you want to use in the extends attribute: dev.cfg, prod.cfg, ...
extends =
base.cfg
port.cfg
amqp.cfg
dev.cfg
# dev-zeo.cfg
test.cfg
6 changes: 1 addition & 5 deletions buildout-main.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@ extends =
base.cfg
port.cfg
amqp.cfg
# prod.cfg
# sources.cfg was renamed as sources-dev.cfg and included in dev.cfg
dev.cfg
# dev-zeo.cfg
test.cfg
prod.cfg
2 changes: 1 addition & 1 deletion buildout.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[buildout]
# Add the config name you want to use in the extends attribute: dev.cfg, prod.cfg, ...
extends =
buildout-main.cfg
buildout-main-dev.cfg
# solr.cfg
# ldap.cfg
# rest.cfg
Expand Down
16 changes: 16 additions & 0 deletions sources-prod.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
# To be used in buildout.cfg in production to fix really revisions
[buildout]
auto-checkout +=
collective.dms.basecontent
imio.esign
imio.fpaudit
imio.pm.wsclient
imio.zamqp.dms

[sources]
collective.dms.basecontent = git ${remotes:collective}/collective.dms.basecontent.git pushurl=${remotes:collective_push}/collective.dms.basecontent.git rev=424cb5b25c86f8ed737de98491bb7d616a54ed80
collective.documentviewer = git ${remotes:sge}/collective.documentviewer.git pushurl=${remotes:sge_push}/collective.documentviewer.git rev=170b27518fc99b167023456430504a0a6a76293b
imio.dms.mail = git ${remotes:imio}/imio.dms.mail.git pushurl=${remotes:imio_push}/imio.dms.mail.git rev=6b16629e08135ce2fde2414b9577f9577883aacc
imio.esign = git ${remotes:imio}/imio.esign.git pushurl=${remotes:imio_push}/imio.esign.git rev=9971ef49b5f2d588c11a4ef4dedd5beff6f17317
imio.fpaudit = git ${remotes:imio}/imio.fpaudit.git pushurl=${remotes:imio_push}/imio.fpaudit.git rev=d01ed5af8769370bc762b63839e6e855b9701b9e
imio.pm.wsclient = git ${remotes:imio}/imio.pm.wsclient.git pushurl=${remotes:imio_push}/imio.pm.wsclient.git rev=5adbc3b994d459ef14b4ae1c56928a3bd0e454fa
imio.zamqp.dms = git ${remotes:imio}/imio.zamqp.dms.git pushurl=${remotes:imio_push}/imio.zamqp.dms.git rev=ce1eec6d79defbf85e651e938bc0ec340d2e17ba
Products.CPUtils = git ${remotes:imio}/Products.CPUtils pushurl=${remotes:imio_push}/Products.CPUtils rev=965e3be3f2ad32d2fe6f72c77cdf19f32669127d
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0-1.dev0
3.1.5.dev0
Loading