Merge pull request #351 from robbuckley/py2718

MRG: Update python 2.7 to 2.7.18

Very minor changes over 2.7.17, but a couple are worth having for anyone still using 2.7
see https://github.com/python/cpython/blob/2.7/Misc/NEWS.d/2.7.18rc1.rst

.travis.yml

@@ -56,16 +56,11 @@ matrix:
     # OSX builds
     - os: osx
       env:
-        - MB_PYTHON_VERSION=2.7
+        - MB_PYTHON_VERSION=2.7.17 # 2.7.18 doesn't have a 10.6 build
         - MB_PYTHON_OSX_VER=10.6
         - TEST_BUILDS=1
         - OPENSSL_ROOT=openssl-1.0.2u
         - OPENSSL_HASH=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
-    - os: osx
-      env:
-        - MB_PYTHON_VERSION=2.7
-        - MB_PYTHON_OSX_VER=10.9
-        - TEST_BUILDS=1
     - os: osx
       env:
         - MB_PYTHON_VERSION=2.7

osx_utils.sh

@@ -14,7 +14,7 @@ WORKING_SDIR=working
 # As of 18 August 2020 - latest Python of each version with binary download
 # available.
 # See: https://www.python.org/downloads/mac-osx/
-LATEST_2p7=2.7.17
+LATEST_2p7=2.7.18
 LATEST_3p5=3.5.4
 LATEST_3p6=3.6.8
 LATEST_3p7=3.7.9
@@ -101,7 +101,7 @@ function macpython_sdk_list_for_version {
     local _return
 
     if [ "$_major" -eq "2" ]; then
-        _return="10.6"
+        [ $(lex_ver $_ver) -lt $(lex_ver 2.7.18) ] && _return="10.6"
         [ $(lex_ver $_ver) -ge $(lex_ver 2.7.15) ] && _return="$_return 10.9"
     elif [ "$_major" -eq "3" ]; then
         [ $(lex_ver $_ver) -lt $(lex_ver 3.8)    ] && _return="10.6"

tests/test_osx_utils.sh

@@ -51,9 +51,11 @@
 [ "$(macpython_sdk_list_for_version 3.6.5)"  == "10.6 10.9" ] || ingest
 [ "$(macpython_sdk_list_for_version 3.6)"    == "10.6 10.9" ] || ingest
 [ "$(macpython_sdk_list_for_version 3.5)"    == "10.6" ] || ingest
-[ "$(macpython_sdk_list_for_version 2.7)"    == "10.6 10.9" ] || ingest
+[ "$(macpython_sdk_list_for_version 2.7)"    == "10.9" ] || ingest
 [ "$(macpython_sdk_list_for_version 2.7.14)" == "10.6" ] || ingest
 [ "$(macpython_sdk_list_for_version 2.7.15)" == "10.6 10.9" ] || ingest
+[ "$(macpython_sdk_list_for_version 2.7.17)" == "10.6 10.9" ] || ingest
+[ "$(macpython_sdk_list_for_version 2.7.18)" == "10.9" ] || ingest
 
 [ "$(macpython_sdk_for_version 3.8)"    == "10.9" ] || ingest
 [ "$(macpython_sdk_for_version 3.5)"    == "10.6" ] || ingest