Update content of generated directories

2.7/README.md

@@ -126,13 +126,20 @@ file inside your source code repository.
     and Pipfile.lock. (Implies `UPGRADE_PIP_TO_LATEST` to satisfy dependencies of
     Pipenv.)
 
+* **DISABLE_SETUP_PY_PROCESSING**
+
+    Set this to a non-empty value to skip processing of setup.py script if you
+    use `-e .` in requirements.txt to trigger its processing or you don't want
+    your application to be installed into site-packages directory.
+
 * **WEB_CONCURRENCY**
 
     Set this to change the default setting for the number of
     [workers](http://docs.gunicorn.org/en/stable/settings.html#workers). By
     default, this is set to the number of available cores times 2, capped
     at 12.
 
+
 Source repository layout
 ------------------------
 
@@ -158,10 +165,8 @@ However, if these files exist they will affect the behavior of the build process
   dependencies, as documented
   [here](https://packaging.python.org/en/latest/distributing.html#setup-py).
   For most projects, it is sufficient to simply use `requirements.txt` or
-  `Pipfile`, if one of these files is present `setup.py` is not processed
-  by default, please use `-e .` to trigger its processing from above mentioned
-  files.
-
+  `Pipfile`. Set `DISABLE_SETUP_PY_PROCESSING` environment variable to true
+  in order to skip processing of this file.
 
 Run strategies
 --------------

2.7/s2i/bin/assemble

@@ -54,9 +54,11 @@ if [[ ! -z "$ENABLE_PIPENV" ]]; then
 elif [[ -f requirements.txt ]]; then
   echo "---> Installing dependencies ..."
   pip install -r requirements.txt
-elif [[ -f setup.py ]]; then
+fi
+
+if [[ -f setup.py && -z "$DISABLE_SETUP_PY_PROCESSING" ]]; then
   echo "---> Installing application ..."
-  python setup.py develop
+  pip install .
 fi
 
 if should_collectstatic; then

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

@@ -1 +1,2 @@
 ENABLE_PIPENV=true
+DISABLE_SETUP_PY_PROCESSING=true

3.4/README.md

@@ -126,13 +126,20 @@ file inside your source code repository.
     and Pipfile.lock. (Implies `UPGRADE_PIP_TO_LATEST` to satisfy dependencies of
     Pipenv.)
 
+* **DISABLE_SETUP_PY_PROCESSING**
+
+    Set this to a non-empty value to skip processing of setup.py script if you
+    use `-e .` in requirements.txt to trigger its processing or you don't want
+    your application to be installed into site-packages directory.
+
 * **WEB_CONCURRENCY**
 
     Set this to change the default setting for the number of
     [workers](http://docs.gunicorn.org/en/stable/settings.html#workers). By
     default, this is set to the number of available cores times 2, capped
     at 12.
 
+
 Source repository layout
 ------------------------
 
@@ -158,10 +165,8 @@ However, if these files exist they will affect the behavior of the build process
   dependencies, as documented
   [here](https://packaging.python.org/en/latest/distributing.html#setup-py).
   For most projects, it is sufficient to simply use `requirements.txt` or
-  `Pipfile`, if one of these files is present `setup.py` is not processed
-  by default, please use `-e .` to trigger its processing from above mentioned
-  files.
-
+  `Pipfile`. Set `DISABLE_SETUP_PY_PROCESSING` environment variable to true
+  in order to skip processing of this file.
 
 Run strategies
 --------------

3.4/s2i/bin/assemble

@@ -54,9 +54,11 @@ if [[ ! -z "$ENABLE_PIPENV" ]]; then
 elif [[ -f requirements.txt ]]; then
   echo "---> Installing dependencies ..."
   pip install -r requirements.txt
-elif [[ -f setup.py ]]; then
+fi
+
+if [[ -f setup.py && -z "$DISABLE_SETUP_PY_PROCESSING" ]]; then
   echo "---> Installing application ..."
-  python setup.py develop
+  pip install .
 fi
 
 if should_collectstatic; then

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

@@ -1 +1,2 @@
 ENABLE_PIPENV=true
+DISABLE_SETUP_PY_PROCESSING=true

3.5/README.md

@@ -126,13 +126,20 @@ file inside your source code repository.
     and Pipfile.lock. (Implies `UPGRADE_PIP_TO_LATEST` to satisfy dependencies of
     Pipenv.)
 
+* **DISABLE_SETUP_PY_PROCESSING**
+
+    Set this to a non-empty value to skip processing of setup.py script if you
+    use `-e .` in requirements.txt to trigger its processing or you don't want
+    your application to be installed into site-packages directory.
+
 * **WEB_CONCURRENCY**
 
     Set this to change the default setting for the number of
     [workers](http://docs.gunicorn.org/en/stable/settings.html#workers). By
     default, this is set to the number of available cores times 2, capped
     at 12.
 
+
 Source repository layout
 ------------------------
 
@@ -158,10 +165,8 @@ However, if these files exist they will affect the behavior of the build process
   dependencies, as documented
   [here](https://packaging.python.org/en/latest/distributing.html#setup-py).
   For most projects, it is sufficient to simply use `requirements.txt` or
-  `Pipfile`, if one of these files is present `setup.py` is not processed
-  by default, please use `-e .` to trigger its processing from above mentioned
-  files.
-
+  `Pipfile`. Set `DISABLE_SETUP_PY_PROCESSING` environment variable to true
+  in order to skip processing of this file.
 
 Run strategies
 --------------

3.5/s2i/bin/assemble

@@ -54,9 +54,11 @@ if [[ ! -z "$ENABLE_PIPENV" ]]; then
 elif [[ -f requirements.txt ]]; then
   echo "---> Installing dependencies ..."
   pip install -r requirements.txt
-elif [[ -f setup.py ]]; then
+fi
+
+if [[ -f setup.py && -z "$DISABLE_SETUP_PY_PROCESSING" ]]; then
   echo "---> Installing application ..."
-  python setup.py develop
+  pip install .
 fi
 
 if should_collectstatic; then

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

@@ -1 +1,2 @@
 ENABLE_PIPENV=true
+DISABLE_SETUP_PY_PROCESSING=true

3.6/README.md

@@ -125,13 +125,20 @@ file inside your source code repository.
     This should be used only if your project contains properly formated Pipfile
     and Pipfile.lock.
 
+* **DISABLE_SETUP_PY_PROCESSING**
+
+    Set this to a non-empty value to skip processing of setup.py script if you
+    use `-e .` in requirements.txt to trigger its processing or you don't want
+    your application to be installed into site-packages directory.
+
 * **WEB_CONCURRENCY**
 
     Set this to change the default setting for the number of
     [workers](http://docs.gunicorn.org/en/stable/settings.html#workers). By
     default, this is set to the number of available cores times 2, capped
     at 12.
 
+
 Source repository layout
 ------------------------
 
@@ -157,10 +164,8 @@ However, if these files exist they will affect the behavior of the build process
   dependencies, as documented
   [here](https://packaging.python.org/en/latest/distributing.html#setup-py).
   For most projects, it is sufficient to simply use `requirements.txt` or
-  `Pipfile`, if one of these files is present `setup.py` is not processed
-  by default, please use `-e .` to trigger its processing from above mentioned
-  files.
-
+  `Pipfile`. Set `DISABLE_SETUP_PY_PROCESSING` environment variable to true
+  in order to skip processing of this file.
 
 Run strategies
 --------------

3.6/s2i/bin/assemble

@@ -53,9 +53,11 @@ if [[ ! -z "$ENABLE_PIPENV" ]]; then
 elif [[ -f requirements.txt ]]; then
   echo "---> Installing dependencies ..."
   pip install -r requirements.txt
-elif [[ -f setup.py ]]; then
+fi
+
+if [[ -f setup.py && -z "$DISABLE_SETUP_PY_PROCESSING" ]]; then
   echo "---> Installing application ..."
-  python setup.py develop
+  pip install .
 fi
 
 if should_collectstatic; then

3.6/test/pipenv-test-app/.s2i/environment

@@ -1 +1,2 @@
 ENABLE_PIPENV=true
+DISABLE_SETUP_PY_PROCESSING=true