fix.sh in checkoff-0.17.0 vs fix.sh in checkoff-0.18.0
- old
+ new
@@ -282,16 +282,11 @@
pyenv_install() {
CFLAGS="-I/usr/local/opt/zlib/include -I/usr/local/opt/bzip2/include -I${HOMEBREW_OPENSSL_PREFIX}/include" LDFLAGS="-L/usr/local/opt/zlib/lib -L/usr/local/opt/bzip2/lib -L${HOMEBREW_OPENSSL_PREFIX}/lib" pyenv install --skip-existing "$@"
}
major_minor="$(cut -d. -f1-2 <<<"${ver}")"
- if [ "${major_minor}" == 3.6 ]
- then
- pyenv_install --patch "${ver}" < <(curl -sSL https://github.com/python/cpython/commit/8ea6353.patch\?full_index=1)
- else
- pyenv_install "${ver}"
- fi
+ pyenv_install "${ver}"
else
pyenv install -s "${ver}"
fi
done
}
@@ -305,15 +300,15 @@
# shellcheck disable=SC2086
pyenv local "${virtualenv_name}" ${python_versions} mylibs
}
ensure_pip_and_wheel() {
- # Make sure we have a pip with the 20.3 resolver, and after the
- # initial bugfix release
+ # pip 22 seems to be better at finding pandas pre-compiled wheels
+ # for macOS, so let's make sure we're using at least that version
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'
+ pip install 'pip>=22'
fi
# wheel is helpful for being able to cache long package builds
pip show wheel >/dev/null 2>&1 || pip install wheel
}