From 52b2756606d6fca23c4e728392ddf691940f4239 Mon Sep 17 00:00:00 2001 From: ale-rt Date: Wed, 6 Nov 2024 10:31:01 +0100 Subject: [PATCH 1/5] Fix virtualenv to use Python3.11 and rename py3 to .venv --- .gitignore | 2 +- Makefile | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index e840e94..1fe1385 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /.installed.cfg /.mr.developer.cfg +/.venv/ /bin/ /buildout.cfg /custom.cfg @@ -7,7 +8,6 @@ /downloads/ /etc/ /parts/ -/py3/ /secret.cfg /src/ /var/ diff --git a/Makefile b/Makefile index 06e8b8b..917c340 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,19 @@ .PHONY: all all: .installed.cfg -py3/bin/buildout: py3/bin/pip3 requirements.txt $(wildcard config/*.txt) +.venv/bin/buildout: .venv/bin/pip3 requirements.txt $(wildcard config/*.txt) # To really be sure we have the desired setuptools we need to uninstall it first - ./py3/bin/pip3 uninstall -y setuptools + ./.venv/bin/pip3 uninstall -y setuptools # ... and reinstall it later - ./py3/bin/pip3 install -IUr config/requirements-venv.txt -c config/constraints.txt - ./py3/bin/pip3 install -IUr requirements.txt - ./py3/bin/pip list | grep "plone.recipe.zope2instance.*6.12.2$$" && ./py3/bin/pip3 install plone.recipe.zope2instance==6.13.0 + ./.venv/bin/pip3 install -IUr config/requirements-venv.txt -c config/constraints.txt + ./.venv/bin/pip3 install -IUr requirements.txt + ./.venv/bin/pip list | grep "plone.recipe.zope2instance.*6.12.2$$" && ./.venv/bin/pip3 install plone.recipe.zope2instance==6.13.0 -py3/bin/pip3: - python3 -m venv py3 +.venv/bin/pip3: + python3.11 -m venv .venv -.installed.cfg: py3/bin/buildout $(wildcard *.cfg config/*.cfg profiles/*.cfg) - ./py3/bin/buildout +.installed.cfg: .venv/bin/buildout $(wildcard *.cfg config/*.cfg profiles/*.cfg) + ./.venv/bin/buildout .PHONY: upgrade upgrade: @@ -21,7 +21,7 @@ upgrade: .PHONY: clean clean: - rm -rf ./py3 + rm -rf ./.venv .PHONY: read_registry read_registry: .installed.cfg From f5bd24a0ce9675482dbb1c38d15f8f942fc8ee69 Mon Sep 17 00:00:00 2001 From: ale-rt Date: Wed, 6 Nov 2024 10:42:47 +0100 Subject: [PATCH 2/5] By default listen on every IP --- config/base.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/base.cfg b/config/base.cfg index e9eb8ec..419b554 100644 --- a/config/base.cfg +++ b/config/base.cfg @@ -18,7 +18,7 @@ recensio.altertum = 2.0.0 recensio.regio = 2.0.0 [settings] -plone_listen_host = 127.0.0.1 +plone_listen_host = 0.0.0.0 zeo_address = ${buildout:directory}/var/zeo.socket tmpdir = http-fast-listen = off From cdf1fd83401066325155d640af889ae90ce1ed2b Mon Sep 17 00:00:00 2001 From: ale-rt Date: Wed, 6 Nov 2024 10:45:41 +0100 Subject: [PATCH 3/5] Only test on Python3.11 --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f02ec16..c1b2dda 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,8 +9,6 @@ jobs: strategy: matrix: config: - - ["Py3.9-Plone6", "3.9"] - - ["Py3.10-Plone6", "3.10"] - ["Py3.11-Plone6", "3.11"] runs-on: ubuntu-latest name: ${{ matrix.config[0] }} From 387a59a8f609a0872a945b454894de1062210007 Mon Sep 17 00:00:00 2001 From: ale-rt Date: Wed, 6 Nov 2024 10:46:52 +0100 Subject: [PATCH 4/5] Use the latest Plone 6 --- config/base.cfg | 6 +++--- config/constraints.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/base.cfg b/config/base.cfg index 419b554..d672886 100644 --- a/config/base.cfg +++ b/config/base.cfg @@ -1,9 +1,9 @@ [buildout] parts = instance extends = - https://dist.plone.org/release/6.0.10.1/versions.cfg - https://dist.plone.org/release/6.0.10.1/versions-ecosystem.cfg - https://dist.plone.org/release/6.0.10.1/versions-extra.cfg + https://dist.plone.org/release/6.0.13/versions.cfg + https://dist.plone.org/release/6.0.13/versions-ecosystem.cfg + https://dist.plone.org/release/6.0.13/versions-extra.cfg versions.cfg show-picked-versions = true newest = false diff --git a/config/constraints.txt b/config/constraints.txt index c6e1eb9..3bb2e32 100644 --- a/config/constraints.txt +++ b/config/constraints.txt @@ -1 +1 @@ --c https://dist.plone.org/release/6.0.10.1/constraints.txt +-c https://dist.plone.org/release/6.0.13/constraints.txt From 9f57ad0fa3ee7dc719e0fbd100bb02a4175847c6 Mon Sep 17 00:00:00 2001 From: ale-rt Date: Wed, 6 Nov 2024 10:54:54 +0100 Subject: [PATCH 5/5] We do not need to have an upgrade plone.recipe.zope2instance because we are using the latest Plone --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 917c340..684dd91 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ all: .installed.cfg # ... and reinstall it later ./.venv/bin/pip3 install -IUr config/requirements-venv.txt -c config/constraints.txt ./.venv/bin/pip3 install -IUr requirements.txt - ./.venv/bin/pip list | grep "plone.recipe.zope2instance.*6.12.2$$" && ./.venv/bin/pip3 install plone.recipe.zope2instance==6.13.0 .venv/bin/pip3: python3.11 -m venv .venv