upgrading sklearn to 1.0.2

Author: Nikhil Raverkar

ci/buildspec-extension.yml

@@ -2,7 +2,7 @@ version: 0.2
 
 env:
   variables:
-    SKLEARN_FRAMEWORK_VERSION: "1.0-11.0-1"
+    SKLEARN_FRAMEWORK_VERSION: "1.0-1"
     EXTENSION_FRAMEWORK_VERSION: "2.5-1"
 
 phases:

ci/buildspec.yml

@@ -22,6 +22,13 @@ phases:
     - pip install wheel setuptools
     - python setup.py bdist_wheel
     - docker build -t preprod-sklearn:$FRAMEWORK_VERSION-cpu-py3 -f docker/$FRAMEWORK_VERSION/final/Dockerfile.cpu .
+    - echo Running tox...
+    - printf "FROM preprod-sklearn:$FRAMEWORK_VERSION-cpu-py3\nADD . /app\nWORKDIR /app\nRUN python3 -m pip install .[test]" > Dockerfile.test
+    - docker build -t test-sklearn -f Dockerfile.test .
+    - docker run --rm -t test-sklearn sh -c 'pytest --cov=sagemaker_sklearn --cov-fail-under=60 test/unit'
+    - docker run --rm -t test-sklearn sh -c 'flake8 setup.py src test'
+    - echo Running container tests...
+    - pytest test/integration/local --docker-base-name preprod-sklearn --tag $FRAMEWORK_VERSION-cpu-py3 --py-version 3 --framework-version $FRAMEWORK_VERSION
     - docker tag preprod-sklearn:$FRAMEWORK_VERSION-cpu-py3 515193369038.dkr.ecr.us-west-2.amazonaws.com/sagemaker-scikit-learn:$FRAMEWORK_VERSION-cpu-py3
   post_build:
     commands:

requirements.txt

@@ -17,4 +17,7 @@ sagemaker-inference==1.2.0
 sagemaker-training==4.0.1
 scikit-learn==1.0.2
 scipy==1.5.3
-six==1.15.0
+six==1.15.0
+jinja2==2.10.2
+MarkupSafe==1.1.1
+Werkzeug==0.15.6

setup.py

@@ -32,6 +32,7 @@ def read(fname):
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.9",
     ],
 
     install_requires=read("requirements.txt"),

test/conftest.py

@@ -43,7 +43,7 @@ def pytest_addoption(parser):
     parser.addoption('--install-container-support', '-C', action='store_true')
     parser.addoption('--docker-base-name', default='sk-learn')
     parser.addoption('--region', default='us-west-2')
-    parser.addoption('--framework-version', default='0.20.0')
+    parser.addoption('--framework-version', default='1.0.2')
     parser.addoption('--py-version', choices=['2', '3'], default=str(sys.version_info.major))
     parser.addoption('--processor', choices=['cpu'], default='cpu')
     # If not specified, will default to {framework-version}-{processor}-py{py-version}