Merge pull request #894 from heroku/undo-revert

Reapply pipenv-ci bugfix
Merge branch 'master' into undo-revert
2026-06-05 23:10:16 +00:00 · 2019-10-23 12:57:27 -07:00 · 2019-10-23 11:40:04 -07:00 · 2019-10-23 10:55:13 -07:00 · 2019-10-22 11:29:58 -07:00 · 2019-10-22 11:28:08 -07:00
3 changed files with 14 additions and 9 deletions
@@ -2,9 +2,14 @@

 # Master

- Python 2.7.17 now available on Heroku 18 and 16.
+- Bugfix: Pipenv no longer installs twice in CI

 --------------------------------------------------------------------------------
+
+# 159 (2019-10-22)
+
+- Python 2.7.17 now available on Heroku 18 and 16.
+
 # 158 (2019-10-21)

 - Python 3.7.5 and 3.8.0 now available on Heroku 18 and 16.
@@ -63,7 +63,7 @@ Supported runtime options include:

 - `python-3.7.4`
 - `python-3.6.9`
- `python-2.7.16`
+- `python-2.7.17`

 ## Tests

@@ -60,10 +60,16 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
        # avoid this eager behavior.
        /app/.heroku/python/bin/pip install pipenv==$PIPENV_VERSION --upgrade --upgrade-strategy only-if-needed &> /dev/null

+        # Install the test dependencies, for CI.
+        if [ "$INSTALL_TEST" ]; then
+            puts-step "Installing test dependencies…"
+            /app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent
+
        # Install the dependencies.
-        if [[ ! -f Pipfile.lock ]]; then
+        elif [[ ! -f Pipfile.lock ]]; then
            puts-step "Installing dependencies with Pipenv $PIPENV_VERSION…"
            /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
+
        else
            pipenv-to-pip Pipfile.lock > requirements.txt
            "$BIN_DIR/steps/pip-uninstall"
@@ -73,12 +79,6 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
            puts-step "Installing dependencies with Pipenv $PIPENV_VERSION…"
            /app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | indent
        fi
-
-        # Install the test dependencies, for CI.
-        if [ "$INSTALL_TEST" ]; then
-            puts-step "Installing test dependencies…"
-            /app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent
-        fi
    fi
 else
    export SKIP_PIP_INSTALL=1
Author	SHA1	Message	Date
Casey	7ceb774c63	Merge pull request #894 from heroku/undo-revert Reapply pipenv-ci bugfix	2019-10-23 12:57:27 -07:00
Casey	f43caaadc3	Merge branch 'master' into undo-revert	2019-10-23 11:40:04 -07:00
Casey	bb31a012fd	Merge pull request #893 from heroku/changelog-fix Release 159 changelog update	2019-10-23 10:55:13 -07:00
Casey Faist	9ab6a56cba	reapply bugfix in preparation for tomorrow's release	2019-10-22 11:29:58 -07:00
Alexandre Paroissien	ab89e49235	Fix pipenv install twice in CI	2019-10-22 11:28:08 -07:00
Casey Faist	5293169aa8	update Readme to reflect 2.7	2019-10-22 09:59:02 -07:00
Casey Faist	3698cb5715	update changelog with latest python 2.7 release	2019-10-22 09:56:01 -07:00