diff --git a/bin/steps/python b/bin/steps/python index 7f53b74..c4804bd 100755 --- a/bin/steps/python +++ b/bin/steps/python @@ -52,11 +52,9 @@ if curl --output /dev/null --silent --head --fail "$VENDORED_PYTHON"; then fi fi if [[ "$PYTHON_VERSION" == $PY27* ]]; then + puts-warn "$PYTHON_2_EOL_UPDATE" + echo " Learn More: https://devcenter.heroku.com/articles/python-2-7-eol-faq" # security update note - if [[ "$(date "+%Y")" -gt "2019" ]]; then - puts-warn "$PYTHON_2_EOL_UPDATE" - echo " Learn More: https://devcenter.heroku.com/articles/python-2-7-eol-faq" - fi if [ "$PYTHON_VERSION" != "$LATEST_27" ]; then puts-warn "$ONLY_SUPPORTED_2_VERSION" "$LATEST_27" echo " Learn More: https://devcenter.heroku.com/articles/python-runtimes" diff --git a/test/run-versions b/test/run-versions index f8bb2cc..8413e27 100755 --- a/test/run-versions +++ b/test/run-versions @@ -19,11 +19,7 @@ testPython2() { echo $LATEST_27 > "runtime.txt" compile "python2" assertCaptured $LATEST_27 - if [[ $(date "+%Y") > "2019" ]]; then - assertCaptured "python-2-7-eol-faq"; - else - assertNotCaptured "python-2-7-eol-faq"; - fi + assertCaptured "python-2-7-eol-faq"; assertNotCaptured "security update" assertCaptured "Installing pip 20.1.1, setuptools 44.1.1 and wheel 0.34.2" assertCaptured "Installing SQLite3" @@ -33,11 +29,7 @@ testPython2() { testPython2_warn() { compile "python2_warn" assertCaptured "python-2.7.15" - if [[ $(date "+%Y") > "2019" ]]; then - assertCaptured "python-2-7-eol-faq"; - else - assertNotCaptured "python-2-7-eol-faq"; - fi + assertCaptured "python-2-7-eol-faq"; assertCaptured "Only the latest version" assertCaptured "Installing SQLite3" assertCapturedSuccess