Skip to content

Commit ffae736

Browse files
mcyprianmcyprian
committed
Update content of generated directories
1 parent 39bf8c5 commit ffae736

12 files changed

Lines changed: 56 additions & 24 deletions

File tree

‎2.7/README.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,20 @@ file inside your source code repository.
126126
and Pipfile.lock. (Implies `UPGRADE_PIP_TO_LATEST` to satisfy dependencies of
127127
Pipenv.)
128128
129+
* **DISABLE_SETUP_PY_PROCESSING**
130+
131+
Set this to a non-empty value to skip processing of setup.py script if you
132+
use `-e .` in requirements.txt to trigger its processing or you don't want
133+
your application to be installed into site-packages directory.
134+
129135
* **WEB_CONCURRENCY**
130136
131137
Set this to change the default setting for the number of
132138
[workers](http://docs.gunicorn.org/en/stable/settings.html#workers). By
133139
default, this is set to the number of available cores times 2, capped
134140
at 12.
135141
142+
136143
Source repository layout
137144
------------------------
138145
@@ -158,10 +165,8 @@ However, if these files exist they will affect the behavior of the build process
158165
dependencies, as documented
159166
[here](https://packaging.python.org/en/latest/distributing.html#setup-py).
160167
For most projects, it is sufficient to simply use `requirements.txt` or
161-
`Pipfile`, if one of these files is present `setup.py` is not processed
162-
by default, please use `-e .` to trigger its processing from above mentioned
163-
files.
164-
168+
`Pipfile`. Set `DISABLE_SETUP_PY_PROCESSING` environment variable to true
169+
in order to skip processing of this file.
165170
166171
Run strategies
167172
--------------

‎2.7/s2i/bin/assemble‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,11 @@ if [[ ! -z "$ENABLE_PIPENV" ]]; then
5454
elif [[ -f requirements.txt ]]; then
5555
echo "---> Installing dependencies ..."
5656
pip install -r requirements.txt
57-
elif [[ -f setup.py ]]; then
57+
fi
58+
59+
if [[ -f setup.py && -z "$DISABLE_SETUP_PY_PROCESSING" ]]; then
5860
echo "---> Installing application ..."
59-
python setup.py develop
61+
pip install .
6062
fi
6163

6264
if should_collectstatic; then

‎2.7/test/pipenv-test-app/.s2i/environment‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
ENABLE_PIPENV=true
2+
DISABLE_SETUP_PY_PROCESSING=true

‎3.4/README.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,20 @@ file inside your source code repository.
126126
and Pipfile.lock. (Implies `UPGRADE_PIP_TO_LATEST` to satisfy dependencies of
127127
Pipenv.)
128128
129+
* **DISABLE_SETUP_PY_PROCESSING**
130+
131+
Set this to a non-empty value to skip processing of setup.py script if you
132+
use `-e .` in requirements.txt to trigger its processing or you don't want
133+
your application to be installed into site-packages directory.
134+
129135
* **WEB_CONCURRENCY**
130136
131137
Set this to change the default setting for the number of
132138
[workers](http://docs.gunicorn.org/en/stable/settings.html#workers). By
133139
default, this is set to the number of available cores times 2, capped
134140
at 12.
135141
142+
136143
Source repository layout
137144
------------------------
138145
@@ -158,10 +165,8 @@ However, if these files exist they will affect the behavior of the build process
158165
dependencies, as documented
159166
[here](https://packaging.python.org/en/latest/distributing.html#setup-py).
160167
For most projects, it is sufficient to simply use `requirements.txt` or
161-
`Pipfile`, if one of these files is present `setup.py` is not processed
162-
by default, please use `-e .` to trigger its processing from above mentioned
163-
files.
164-
168+
`Pipfile`. Set `DISABLE_SETUP_PY_PROCESSING` environment variable to true
169+
in order to skip processing of this file.
165170
166171
Run strategies
167172
--------------

‎3.4/s2i/bin/assemble‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,11 @@ if [[ ! -z "$ENABLE_PIPENV" ]]; then
5454
elif [[ -f requirements.txt ]]; then
5555
echo "---> Installing dependencies ..."
5656
pip install -r requirements.txt
57-
elif [[ -f setup.py ]]; then
57+
fi
58+
59+
if [[ -f setup.py && -z "$DISABLE_SETUP_PY_PROCESSING" ]]; then
5860
echo "---> Installing application ..."
59-
python setup.py develop
61+
pip install .
6062
fi
6163

6264
if should_collectstatic; then

‎3.4/test/pipenv-test-app/.s2i/environment‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
ENABLE_PIPENV=true
2+
DISABLE_SETUP_PY_PROCESSING=true

‎3.5/README.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,20 @@ file inside your source code repository.
126126
and Pipfile.lock. (Implies `UPGRADE_PIP_TO_LATEST` to satisfy dependencies of
127127
Pipenv.)
128128
129+
* **DISABLE_SETUP_PY_PROCESSING**
130+
131+
Set this to a non-empty value to skip processing of setup.py script if you
132+
use `-e .` in requirements.txt to trigger its processing or you don't want
133+
your application to be installed into site-packages directory.
134+
129135
* **WEB_CONCURRENCY**
130136
131137
Set this to change the default setting for the number of
132138
[workers](http://docs.gunicorn.org/en/stable/settings.html#workers). By
133139
default, this is set to the number of available cores times 2, capped
134140
at 12.
135141
142+
136143
Source repository layout
137144
------------------------
138145
@@ -158,10 +165,8 @@ However, if these files exist they will affect the behavior of the build process
158165
dependencies, as documented
159166
[here](https://packaging.python.org/en/latest/distributing.html#setup-py).
160167
For most projects, it is sufficient to simply use `requirements.txt` or
161-
`Pipfile`, if one of these files is present `setup.py` is not processed
162-
by default, please use `-e .` to trigger its processing from above mentioned
163-
files.
164-
168+
`Pipfile`. Set `DISABLE_SETUP_PY_PROCESSING` environment variable to true
169+
in order to skip processing of this file.
165170
166171
Run strategies
167172
--------------

‎3.5/s2i/bin/assemble‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,11 @@ if [[ ! -z "$ENABLE_PIPENV" ]]; then
5454
elif [[ -f requirements.txt ]]; then
5555
echo "---> Installing dependencies ..."
5656
pip install -r requirements.txt
57-
elif [[ -f setup.py ]]; then
57+
fi
58+
59+
if [[ -f setup.py && -z "$DISABLE_SETUP_PY_PROCESSING" ]]; then
5860
echo "---> Installing application ..."
59-
python setup.py develop
61+
pip install .
6062
fi
6163

6264
if should_collectstatic; then

‎3.5/test/pipenv-test-app/.s2i/environment‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
ENABLE_PIPENV=true
2+
DISABLE_SETUP_PY_PROCESSING=true

‎3.6/README.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,20 @@ file inside your source code repository.
125125
This should be used only if your project contains properly formated Pipfile
126126
and Pipfile.lock.
127127
128+
* **DISABLE_SETUP_PY_PROCESSING**
129+
130+
Set this to a non-empty value to skip processing of setup.py script if you
131+
use `-e .` in requirements.txt to trigger its processing or you don't want
132+
your application to be installed into site-packages directory.
133+
128134
* **WEB_CONCURRENCY**
129135
130136
Set this to change the default setting for the number of
131137
[workers](http://docs.gunicorn.org/en/stable/settings.html#workers). By
132138
default, this is set to the number of available cores times 2, capped
133139
at 12.
134140
141+
135142
Source repository layout
136143
------------------------
137144
@@ -157,10 +164,8 @@ However, if these files exist they will affect the behavior of the build process
157164
dependencies, as documented
158165
[here](https://packaging.python.org/en/latest/distributing.html#setup-py).
159166
For most projects, it is sufficient to simply use `requirements.txt` or
160-
`Pipfile`, if one of these files is present `setup.py` is not processed
161-
by default, please use `-e .` to trigger its processing from above mentioned
162-
files.
163-
167+
`Pipfile`. Set `DISABLE_SETUP_PY_PROCESSING` environment variable to true
168+
in order to skip processing of this file.
164169
165170
Run strategies
166171
--------------

0 commit comments

Comments
 (0)