Skip to content

Commit f06dc54

Browse files
committed
use pipenv rather than pip install
1 parent ea5cc73 commit f06dc54

File tree

9 files changed

+193
-21
lines changed

9 files changed

+193
-21
lines changed

.envrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
layout pipenv
2+
# announce python version and show the path of the current python in ${PATH}
3+
echo "Virtualenv has been activated for $(python -V)"
4+
echo "Virtualenv dir: $(which python)"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ sdist
1313
develop-eggs
1414
.installed.cfg
1515
src-mrd/
16+
.venv
1617

1718
# Installer logs
1819
pip-log.txt

.gitlab-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
before_script:
22
- echo -e "[buildout]\nlogin = admin\npassword = admin" > secret.cfg
33
- ln -fs local_ci.cfg local.cfg
4-
- python3 -m venv .
5-
- ./bin/pip install -r requirements.txt
4+
- pipenv install
65
- ./bin/develop up -f || true
76
- ./bin/buildout -t 3 || ./bin/buildout -v
87

98
job1:
109
script:
1110
- export DISPLAY=:99
12-
- ./bin/pre-commit run -a
11+
- pipenv run pre-commit run -a
1312
- ./bin/test

CHANGES.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
Changes
22

3+
Unreleased
4+
==========
5+
6+
- Use pipenv
7+
38
3.5
49
===
510
- Remove temporarystorage for Plone 6.0 (local_coredev.cfg)

Pipfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[[source]]
2+
url = "https://pypi.org/simple"
3+
verify_ssl = true
4+
name = "pypi"
5+
6+
[packages]
7+
setuptools = "==65.5.1"
8+
wheel = "==0.38.4"
9+
"zc.buildout" = "==3.0.1"
10+
11+
[dev-packages]
12+
13+
[requires]
14+
python_version = "3.11"

Pipfile.lock

Lines changed: 162 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.txt

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,18 @@ Symlink to the file that best fits you local environment. At first that is usual
5353

5454
ln -s local_develop.cfg local.cfg
5555

56-
Create a virtualenv in Python 2.7 or Python 3.7 (Plone 5.2 only).
57-
58-
.. code-block:: bash
59-
60-
virtualenv . # for Python 2.7
61-
python3.7 -m venv . # for Python 3 (Plone 5.2 only)
62-
6356
Install and configure Plone
6457

6558
.. code-block:: bash
6659

67-
./bin/pip install -r requirements.txt
68-
./bin/buildout
60+
pipenv install
61+
pipenv run buildout
6962

7063
Install git pre-commit hooks
7164

7265
.. code-block:: bash
7366

74-
./bin/pre-commit install
67+
pipenv run pre-commit install
7568

7669

7770
Structure
@@ -196,11 +189,11 @@ Symlink to the development-config:
196189

197190
The development-setup will build a simple instance with some useful tools (see below). The setup assumes that zeo, varnish and loadbalancing are only configured on production.
198191

199-
Install git pre-commit hooks using the pre-commit tool that was installed via requirements.txt:
192+
Install git pre-commit hooks using the pre-commit tool that was installed via pipenv:
200193

201194
.. code-block:: bash
202195

203-
./bin/pre-commit install
196+
pipenv run pre-commit install
204197

205198

206199
Use in production

constraints.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

requirements.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)