Merge branch 'master' into sdk-defaults-logging-behavior-quick-fix

benieric · web-flow · commit 992f16d03a4f · 2023-08-30T15:46:27.000-07:00
diff --git a/.githooks/pre-push b/.githooks/pre-push
@@ -12,5 +12,5 @@ start_time=`date +%s`
 tox -e sphinx,doc8 --parallel all
 ./ci-scripts/displaytime.sh 'sphinx,doc8' $start_time
 start_time=`date +%s`
-tox -e py37,py38,py39 --parallel all -- tests/unit
-./ci-scripts/displaytime.sh 'py37,py38,py39 unit' $start_time
+tox -e py38,py39,py310 --parallel all -- tests/unit
+./ci-scripts/displaytime.sh 'py38,py39,py310 unit' $start_time
diff --git a/README.rst b/README.rst
@@ -87,7 +87,6 @@ Supported Python Versions
 
 SageMaker Python SDK is tested on:
 
-- Python 3.7
 - Python 3.8
 - Python 3.9
 - Python 3.10
diff --git a/setup.py b/setup.py
@@ -92,14 +92,13 @@ def read_requirements(filename):
     url="https://github.com/aws/sagemaker-python-sdk/",
     license="Apache License 2.0",
     keywords="ML Amazon AWS AI Tensorflow MXNet",
-    python_requires=">= 3.6",
+    python_requires=">= 3.7",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
diff --git a/src/sagemaker/image_uri_config/image-classification-neo.json b/src/sagemaker/image_uri_config/image-classification-neo.json
@@ -28,7 +28,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "image-classification-neo"
         }
diff --git a/src/sagemaker/image_uri_config/inferentia-mxnet.json b/src/sagemaker/image_uri_config/inferentia-mxnet.json
@@ -30,7 +30,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"                
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-neo-mxnet"
         },
@@ -62,7 +63,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-neo-mxnet"
         }
diff --git a/src/sagemaker/image_uri_config/inferentia-pytorch.json b/src/sagemaker/image_uri_config/inferentia-pytorch.json
@@ -30,7 +30,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-neo-pytorch"
         },
@@ -62,7 +63,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-neo-pytorch"
         },
@@ -94,7 +96,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-neo-pytorch"
         }
diff --git a/src/sagemaker/image_uri_config/inferentia-tensorflow.json b/src/sagemaker/image_uri_config/inferentia-tensorflow.json
@@ -30,7 +30,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"                
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-neo-tensorflow"
         },
@@ -62,7 +63,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-neo-tensorflow"
         }
diff --git a/src/sagemaker/image_uri_config/neo-mxnet.json b/src/sagemaker/image_uri_config/neo-mxnet.json
@@ -44,7 +44,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-mxnet"
         }
diff --git a/src/sagemaker/image_uri_config/neo-pytorch.json b/src/sagemaker/image_uri_config/neo-pytorch.json
@@ -48,7 +48,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-pytorch"
         },
@@ -80,7 +81,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-pytorch"
         },
@@ -112,7 +114,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-pytorch"
         },
@@ -144,7 +147,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-pytorch"
         },
@@ -176,7 +180,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-pytorch"
         },
@@ -208,7 +213,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-pytorch"
         },
@@ -240,7 +246,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-pytorch"
         },
@@ -272,7 +279,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-pytorch"
         }
diff --git a/src/sagemaker/image_uri_config/neo-tensorflow.json b/src/sagemaker/image_uri_config/neo-tensorflow.json
@@ -50,7 +50,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-tensorflow"
         },
@@ -82,7 +83,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "sagemaker-inference-tensorflow"
         }
diff --git a/src/sagemaker/image_uri_config/xgboost-neo.json b/src/sagemaker/image_uri_config/xgboost-neo.json
@@ -28,7 +28,8 @@
                 "us-iso-east-1": "167761179201",
                 "us-isob-east-1": "406031935815",
                 "us-west-1": "710691900526",
-                "us-west-2": "301217895009"
+                "us-west-2": "301217895009",
+                "il-central-1": "275950707576"
             },
             "repository": "xgboost-neo"
         }
diff --git a/tests/data/remote_function/old_deps_requirements.txt b/tests/data/remote_function/old_deps_requirements.txt
@@ -1 +1 @@
-pandas==1.1.0
+pandas==1.3.4
diff --git a/tests/integ/sagemaker/remote_function/conftest.py b/tests/integ/sagemaker/remote_function/conftest.py
@@ -19,6 +19,7 @@
 import pytest
 import docker
 import re
+import sys
 
 from sagemaker.utils import sagemaker_timestamp, _tmpdir, sts_regional_endpoint
 
@@ -87,21 +88,32 @@
 
 
 @pytest.fixture(scope="package")
-def dummy_container_without_error(sagemaker_session):
-    # TODO: the python version should be dynamically specified instead of hardcoding
-    ecr_uri = _build_container(sagemaker_session, "3.7", DOCKERFILE_TEMPLATE)
+def compatible_python_version():
+    return "{}.{}".format(sys.version_info.major, sys.version_info.minor)
+
+
+@pytest.fixture(scope="package")
+def incompatible_python_version():
+    return "{}.{}".format(sys.version_info.major, sys.version_info.minor + 1)
+
+
+@pytest.fixture(scope="package")
+def dummy_container_without_error(sagemaker_session, compatible_python_version):
+    ecr_uri = _build_container(sagemaker_session, compatible_python_version, DOCKERFILE_TEMPLATE)
     return ecr_uri
 
 
 @pytest.fixture(scope="package")
-def dummy_container_incompatible_python_runtime(sagemaker_session):
-    ecr_uri = _build_container(sagemaker_session, "3.10", DOCKERFILE_TEMPLATE)
+def dummy_container_incompatible_python_runtime(sagemaker_session, incompatible_python_version):
+    ecr_uri = _build_container(sagemaker_session, incompatible_python_version, DOCKERFILE_TEMPLATE)
     return ecr_uri
 
 
 @pytest.fixture(scope="package")
-def dummy_container_with_conda(sagemaker_session):
-    ecr_uri = _build_container(sagemaker_session, "3.7", DOCKERFILE_TEMPLATE_WITH_CONDA)
+def dummy_container_with_conda(sagemaker_session, compatible_python_version):
+    ecr_uri = _build_container(
+        sagemaker_session, compatible_python_version, DOCKERFILE_TEMPLATE_WITH_CONDA
+    )
     return ecr_uri
 
 
diff --git a/tests/integ/sagemaker/remote_function/test_decorator.py b/tests/integ/sagemaker/remote_function/test_decorator.py
@@ -272,6 +272,13 @@ def divide(x, y):
 def test_with_incompatible_dependencies(
     sagemaker_session, dummy_container_without_error, cpu_instance_type
 ):
+    """
+    This test is limited by the python version it is run with.
+    It is currently working with python 3.8+. However, running it with older versions
+    or versions in the future may require changes to 'old_deps_requirements.txt'
+    to fulfill testing scenario.
+
+    """
 
     dependencies_path = os.path.join(DATA_DIR, "remote_function", "old_deps_requirements.txt")
 
diff --git a/tests/unit/sagemaker/image_uris/test_neo.py b/tests/unit/sagemaker/image_uris/test_neo.py
@@ -46,6 +46,7 @@
     "us-isob-east-1": "406031935815",
     "us-west-1": "710691900526",
     "us-west-2": "301217895009",
+    "il-central-1": "275950707576",
 }
 
 INFERENTIA_REGIONS = ACCOUNTS.keys()
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = black-format,flake8,pylint,docstyle,sphinx,doc8,twine,py37,py38,py39,py310
+envlist = black-format,flake8,pylint,docstyle,sphinx,doc8,twine,py38,py39,py310
 
 skip_missing_interpreters = False
 
@@ -73,13 +73,13 @@ passenv =
 # Can be used to specify which tests to run, e.g.: tox -- -s
 commands =
     python -c "import os; os.system('install-custom-pkgs --install-boto-wheels')"
-    pip install 'apache-airflow==2.6.3' --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-2.6.3/constraints-3.7.txt"
+    pip install 'apache-airflow==2.7.0' --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-2.7.0/constraints-3.8.txt"
 
     pytest --cov=sagemaker --cov-append {posargs}
     {env:IGNORE_COVERAGE:} coverage report -i --fail-under=86
 deps = .[test]
 depends =
-    {py37,py38,py39,py310}: clean
+    {py38,py39,py310}: clean
 
 [testenv:flake8]
 skipdist = true
