Merging latest changes from main branch

README.md

@@ -9,6 +9,54 @@ This website will contain further details about the IMAP project:
 * Development of test lists
 * The IMAP team and partners
 
+## Installation and Buildout
+
+### Ubuntu 22.04.2 LTS
+
+Setup system dependencies:
+
+```
+sudo apt install build-essential python3-dev
+```
+
+### Setup venv and buildout environment Ubuntu 22.04.2
+
+```
+python3.8 -m venv venv
+venv/bin/pip install setuptools==65.7.0 zc.buildout==3.0.1 wheel==0.38.4 \
+plonecli
+venv/bin/buildout bootstrap
+```
+
+### venv and buildout environment where base Python is newer than 3.8
+
+Plone 5.2 currently works best on Python 3.8, where base version is not
+Python 3.8, you will need to install custom version of Python 3.8 using
+tools such as `pyenv`
+
+Python module dependencies
+
+```
+apt install libssl-dev libsqlite3-dev libbz2-dev libncurses-dev \
+libffi-dev libreadline-dev liblzma-dev
+```
+
+Setup venv using pyenv Python3.8 binary
+```
+git clone https://github.com/pyenv/pyenv.git ~/.pyenv
+~/.pyenv/bin/install 3.8
+~/.pyenv/versions/3.8.17/bin/python3.8 -m venv venv
+```
+
+### Buildout
+
+Run buildout:
+
+```
+bin/buildout -vvv
+```
+
+
 ### To run test site:
 - Install zc.buildout: `pip install wheel zc.buildout`
 - Update add-on folders `bin/develop update`

buildout.cfg

@@ -22,25 +22,29 @@ find-links +=
 eggs =
     Plone
     Pillow
+    collective.relationhelpers
+    sinar.advisory
     sinar.resource
     sinar.activity
+    sinar.article
+    sinar.indicators
     sinar.organization
-    sinar.citation
     sinar.project
     sinar.miscbehavior
     imap.customizations
     collective.vocabularies.iso
-    collective.behavior.banner
-    plone.app.mosaic==3.0
-    plone.gallery
+    collective.behavior.banner==2.0
     eea.facetednavigation
-    sinar.advisory
-    sinar.article
+    imap.customizations
     plone.volto
     pandas
-    plone.restapi
-    collective.relationhelpers
-
+    plone.app.drafts
+    plone.app.standardtiles
+    plone.app.tiles
+    plone.jsonserializer
+    z3c.jbot
+    plone.app.blocks
+
 zcml =
 #    plone.reload
 
@@ -60,17 +64,17 @@ verbose-security = off
 threads = 2
 
 [sources]
+sinar.activity = git git@github.com:Sinar/sinar.activity.git
+sinar.advisory = git git@github.com:Sinar/sinar.advisory.git
+sinar.article = git git@github.com:Sinar/sinar.article.git
 sinar.miscbehavior = git git@github.com:Sinar/sinar.miscbehavior branch=main
 sinar.organization = git git@github.com:Sinar/sinar.organization branch=main
 sinar.project = git git@github.com:Sinar/sinar.project branch=main
 sinar.indicators = git git@github.com:Sinar/sinar.indicators branch=main
 sinar.resource = git git@github.com:Sinar/sinar.resource branch=main
 imap.customizations = git git@github.com:Sinar/imap.customizations.git
 collective.vocabularies.iso = git git@github.com:Sinar/collective.vocabularies.iso.git
-sinar.advisory = git git@github.com:Sinar/sinar.advisory branch=main
-sinar.article = git git@github.com:Sinar/sinar.article branch=plone-6-update
-collective.behavior.banner = git git@github.com:collective/collective.behavior.banner branch=master
-
+#collective.behavior.banner = git git@github.com:collective/collective.behavior.banner branch=master
 
 [instance]
 <= instance_base
@@ -79,6 +83,7 @@ http-address = 127.0.0.1:8080
 zodb-temporary-storage = off
 
 [versions]
+plone.restapi = 8.43.1
 
 
 

deployment.cfg

@@ -3,14 +3,13 @@ extends = buildout.cfg
 parts +=
 
 [sources]
-sinar.activity = git https://github.com/Sinar/sinar.activity branch=plone-6-update
-sinar.citation = git https://github.com/Sinar/sinar.citation branch=plone-6-update
+sinar.activity = git https://github.com/Sinar/sinar.activity.git
+sinar.advisory = git https://github.com/Sinar/sinar.advisory.git
+sinar.article = git https://github.com/Sinar/sinar.article.git
 sinar.resource = git https://github.com/Sinar/sinar.resource branch=main
 sinar.project = git https://github.com/Sinar/sinar.project branch=main
 sinar.indicators = git https://github.com/Sinar/sinar.indicators branch=main
-sinar.organization = git https://github.com/Sinar/sinar.organization branch=plone-6-update
-foecluster.km = git https://github.com/Sinar/foecluster.km branch=main
+sinar.organization = git https://github.com/Sinar/sinar.organization branch=main
 sinar.miscbehavior = git https://github.com/Sinar/sinar.miscbehavior branch=main
-collective.vocabularies.iso = git https://github.com/sinar/collective.vocabularies.iso
-collective.behavior.banner = git https://github.com/collective/collective.behavior.banner branch=main
-eea.facetednavigation = git https://github.com/eea/eea.facetednavigation branch=main
+collective.vocabularies.iso = git https://github.com/Sinar/collective.vocabularies.iso.git
+imap.customizations = git https://github.com/Sinar/imap.customizations.git