From d7cd321716772092f3aad67ea2c260710091a720 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Wed, 22 Sep 2021 10:26:42 -0400 Subject: [PATCH 1/3] CLN Removes final references to python 3.6 --- build_tools/github/build_minimal_windows_image.sh | 4 ++-- build_tools/github/test_windows_wheels.sh | 4 ++-- doc/install.rst | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build_tools/github/build_minimal_windows_image.sh b/build_tools/github/build_minimal_windows_image.sh index 67a6180952591..abe5262359cde 100644 --- a/build_tools/github/build_minimal_windows_image.sh +++ b/build_tools/github/build_minimal_windows_image.sh @@ -6,8 +6,8 @@ set -x PYTHON_VERSION=$1 BITNESS=$2 -if [[ "$PYTHON_VERSION" == "36" || "$BITNESS" == "32" ]]; then - # Python 3.6 and 32-bit architectures are not supported +if [[ "$BITNESS" == "32" ]]; then + # For 32-bit architectures are not supported # by the official Docker images: Tests will just be run # on the host (instead of the minimal Docker container). exit 0 diff --git a/build_tools/github/test_windows_wheels.sh b/build_tools/github/test_windows_wheels.sh index ff3f823be754b..660172b245703 100644 --- a/build_tools/github/test_windows_wheels.sh +++ b/build_tools/github/test_windows_wheels.sh @@ -6,8 +6,8 @@ set -x PYTHON_VERSION=$1 BITNESS=$2 -if [[ "$PYTHON_VERSION" == "36" || "$BITNESS" == "32" ]]; then - # For Python 3.6 and 32-bit architecture use the regular +if [[ "$BITNESS" == "32" ]]; then + # For 32-bit architecture use the regular # test command (outside of the minimal Docker container) cp $CONFTEST_PATH $CONFTEST_NAME pytest --pyargs sklearn diff --git a/doc/install.rst b/doc/install.rst index 808609b96586f..170bae9257b7d 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -247,7 +247,7 @@ command: .. prompt:: bash $ - sudo port install py36-scikit-learn + sudo port install py39-scikit-learn Anaconda and Enthought Deployment Manager for all supported platforms From 68338698a100fef5bbe859100443cd39a697174b Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Wed, 22 Sep 2021 14:19:55 -0400 Subject: [PATCH 2/3] CLN Better grammar --- build_tools/github/build_minimal_windows_image.sh | 2 +- build_tools/github/test_windows_wheels.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/github/build_minimal_windows_image.sh b/build_tools/github/build_minimal_windows_image.sh index abe5262359cde..18905a5f1f21e 100644 --- a/build_tools/github/build_minimal_windows_image.sh +++ b/build_tools/github/build_minimal_windows_image.sh @@ -7,7 +7,7 @@ PYTHON_VERSION=$1 BITNESS=$2 if [[ "$BITNESS" == "32" ]]; then - # For 32-bit architectures are not supported + # 32-bit architectures are not supported # by the official Docker images: Tests will just be run # on the host (instead of the minimal Docker container). exit 0 diff --git a/build_tools/github/test_windows_wheels.sh b/build_tools/github/test_windows_wheels.sh index 660172b245703..d88b3efd2fbb4 100644 --- a/build_tools/github/test_windows_wheels.sh +++ b/build_tools/github/test_windows_wheels.sh @@ -7,7 +7,7 @@ PYTHON_VERSION=$1 BITNESS=$2 if [[ "$BITNESS" == "32" ]]; then - # For 32-bit architecture use the regular + # 32-bit architecture use the regular # test command (outside of the minimal Docker container) cp $CONFTEST_PATH $CONFTEST_NAME pytest --pyargs sklearn From 441e806fdafe080cb8120ae66c9033020917a4dc Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Wed, 22 Sep 2021 17:32:17 -0400 Subject: [PATCH 3/3] CLN More grammar fixes --- build_tools/github/test_windows_wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/github/test_windows_wheels.sh b/build_tools/github/test_windows_wheels.sh index d88b3efd2fbb4..cf33252d551ba 100644 --- a/build_tools/github/test_windows_wheels.sh +++ b/build_tools/github/test_windows_wheels.sh @@ -7,7 +7,7 @@ PYTHON_VERSION=$1 BITNESS=$2 if [[ "$BITNESS" == "32" ]]; then - # 32-bit architecture use the regular + # 32-bit architectures use the regular # test command (outside of the minimal Docker container) cp $CONFTEST_PATH $CONFTEST_NAME pytest --pyargs sklearn