fix.sh in checkoff-0.12.1 vs fix.sh in checkoff-0.13.0
- old
+ new
@@ -93,11 +93,11 @@
# You can find out which feature versions are still supported / have
# been release here: https://www.ruby-lang.org/en/downloads/
ensure_ruby_versions() {
# You can find out which feature versions are still supported / have
- # been release here: https://www.python.org/downloads/
+ # been release here: https://www.ruby-lang.org/en/downloads/
ruby_versions="$(latest_ruby_version 2.6)"
echo "Latest Ruby versions: ${ruby_versions}"
ensure_ruby_build_requirements
@@ -225,18 +225,20 @@
ensure_dev_library zlib.h zlib zlib1g-dev
ensure_dev_library bzlib.h bzip2 libbz2-dev
ensure_dev_library openssl/ssl.h openssl libssl-dev
ensure_dev_library ffi.h libffi libffi-dev
ensure_dev_library sqlite3.h sqlite3 libsqlite3-dev
+ ensure_dev_library lzma.h xz liblzma-dev
+ ensure_dev_library readline.h readline libreadline-dev
}
# You can find out which feature versions are still supported / have
# been release here: https://www.python.org/downloads/
ensure_python_versions() {
# You can find out which feature versions are still supported / have
# been release here: https://www.python.org/downloads/
- python_versions="$(latest_python_version 3.9)"
+ python_versions="$(latest_python_version 3.10)"
echo "Latest Python versions: ${python_versions}"
ensure_python_build_requirements
@@ -269,18 +271,20 @@
pyenv virtualenv "${latest_python_version}" mylibs || true
# shellcheck disable=SC2086
pyenv local "${virtualenv_name}" ${python_versions} mylibs
}
-ensure_pip() {
+ensure_pip_and_wheel() {
# Make sure we have a pip with the 20.3 resolver, and after the
# initial bugfix release
major_pip_version=$(pip --version | cut -d' ' -f2 | cut -d '.' -f 1)
if [[ major_pip_version -lt 21 ]]
then
pip install 'pip>=20.3.1'
fi
+ # wheel is helpful for being able to cache long package builds
+ pip show wheel >/dev/null 2>&1 || pip install wheel
}
ensure_python_requirements() {
make pip_install
}
@@ -323,10 +327,10 @@
ensure_python_versions
ensure_pyenv_virtualenvs
-ensure_pip
+ensure_pip_and_wheel
ensure_python_requirements
ensure_shellcheck