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

Fix virtualenv to use Python3.11 and rename py3 to .venv #32

Merged
merged 5 commits into from
Nov 6, 2024
Merged
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
2 changes: 0 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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] }}
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/.installed.cfg
/.mr.developer.cfg
/.venv/
/bin/
/buildout.cfg
/custom.cfg
/develop-eggs/
/downloads/
/etc/
/parts/
/py3/
/secret.cfg
/src/
/var/
19 changes: 9 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
.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

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:
./bin/upgrade plone_upgrade -A && ./bin/upgrade install -Ap

.PHONY: clean
clean:
rm -rf ./py3
rm -rf ./.venv

.PHONY: read_registry
read_registry: .installed.cfg
Expand Down
8 changes: 4 additions & 4 deletions config/base.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/constraints.txt
Original file line number Diff line number Diff line change
@@ -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
Loading