Skip to content
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

- Python 3.10.10 and 3.11.2 are now available ([#1405](https://github.com/heroku/heroku-buildpack-python/pull/1405)).
- The default Python version for new apps is now 3.10.10 (previously 3.10.9) ([#1405](https://github.com/heroku/heroku-buildpack-python/pull/1405)).
- Update Pipenv from 2020.11.15 to: ([#1407](https://github.com/heroku/heroku-buildpack-python/pull/1407))
- 2022.4.8 for Python 3.6
- 2023.2.4 for Python 3.7+
- Add a deprecation warning for Python 3.7 ([#1404](https://github.com/heroku/heroku-buildpack-python/pull/1404)).

## v224 (2022-12-07)
Expand Down
15 changes: 9 additions & 6 deletions bin/steps/pipenv
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,16 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then
mcount "buildvar.PIP_EXTRA_INDEX_URL"
fi

PIPENV_VERSION='2020.11.15'
PIPENV_VERSION='2023.2.4'

# Install pipenv.
# Due to weird old pip behavior and pipenv behavior, pipenv upgrades pip
# to latest if only --upgrade is specified. Specify upgrade strategy to
# avoid this eager behavior.
/app/.heroku/python/bin/pip install "pipenv==${PIPENV_VERSION}" --upgrade --upgrade-strategy only-if-needed &> /dev/null
case "${PYTHON_VERSION}" in
python-3.6.*)
# Python 3.6 support was dropped in pipenv 2022.4.20.
PIPENV_VERSION='2022.4.8'
;;
esac

/app/.heroku/python/bin/pip install --quiet --disable-pip-version-check --no-cache-dir "pipenv==${PIPENV_VERSION}"

# Install the test dependencies, for CI.
if [ "$INSTALL_TEST" ]; then
Expand Down
2 changes: 1 addition & 1 deletion bin/steps/python
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ if ! curl --silent --show-error --fail --retry 3 --retry-connrefused --connect-t
exit 1
fi

/app/.heroku/python/bin/python "${PIP_WHEEL}/pip" install --quiet --disable-pip-version-check --no-cache \
/app/.heroku/python/bin/python "${PIP_WHEEL}/pip" install --quiet --disable-pip-version-check --no-cache-dir \
"${PIP_WHEEL}" "setuptools==${SETUPTOOLS_VERSION}" "wheel==${WHEEL_VERSION}"

hash -r
6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_and_requirements_txt/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion spec/fixtures/pipenv_and_runtime_txt/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ urllib3 = "*"
[dev-packages]

[requires]
python_version = "3.8"
python_version = "3.9"
10 changes: 5 additions & 5 deletions spec/fixtures/pipenv_and_runtime_txt/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_lockfile_out_of_sync/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_python_2.7/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_python_3.10/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_python_3.11/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_python_3.5/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_python_3.6/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_python_3.7/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_python_3.8/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_python_3.9/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion spec/fixtures/pipenv_python_full_version/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ urllib3 = "*"
[dev-packages]

[requires]
python_full_version = "3.10.4"
python_full_version = "3.10.7"
10 changes: 5 additions & 5 deletions spec/fixtures/pipenv_python_full_version/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions spec/fixtures/pipenv_python_version_invalid/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading