From f43561ab2c0b783e041c576f8cd4fe1ee16ae061 Mon Sep 17 00:00:00 2001 From: EC2 Default User Date: Fri, 5 Sep 2025 20:22:58 +0000 Subject: [PATCH 1/4] feat: upgrade python version to 3.10 --- docker/{1.2-1 => 1.2-2}/base/Dockerfile.cpu | 2 +- docker/{1.2-1 => 1.2-2}/extension/Dockerfile.cpu | 0 docker/{1.2-1 => 1.2-2}/extension/README.md | 0 docker/{1.2-1 => 1.2-2}/final/Dockerfile.cpu | 6 +++--- .../resources/libffi7_3.3-6_arm64.deb | Bin .../resources/mms/ExecutionParameters.java | 0 .../resources/mms/config.properties.tmp | 0 .../resources/mms/endpoints-1.0.jar | Bin requirements.txt | 5 +++-- setup.py | 1 + test-requirements.txt | 1 - test.parquet | Bin 0 -> 1648 bytes test/utils/local_mode.py | 6 ++++++ 13 files changed, 14 insertions(+), 7 deletions(-) rename docker/{1.2-1 => 1.2-2}/base/Dockerfile.cpu (99%) rename docker/{1.2-1 => 1.2-2}/extension/Dockerfile.cpu (100%) rename docker/{1.2-1 => 1.2-2}/extension/README.md (100%) rename docker/{1.2-1 => 1.2-2}/final/Dockerfile.cpu (91%) rename docker/{1.2-1 => 1.2-2}/resources/libffi7_3.3-6_arm64.deb (100%) rename docker/{1.2-1 => 1.2-2}/resources/mms/ExecutionParameters.java (100%) rename docker/{1.2-1 => 1.2-2}/resources/mms/config.properties.tmp (100%) rename docker/{1.2-1 => 1.2-2}/resources/mms/endpoints-1.0.jar (100%) create mode 100644 test.parquet diff --git a/docker/1.2-1/base/Dockerfile.cpu b/docker/1.2-2/base/Dockerfile.cpu similarity index 99% rename from docker/1.2-1/base/Dockerfile.cpu rename to docker/1.2-2/base/Dockerfile.cpu index 52c575b9..fd1d88f0 100644 --- a/docker/1.2-1/base/Dockerfile.cpu +++ b/docker/1.2-2/base/Dockerfile.cpu @@ -28,7 +28,7 @@ ARG MINICONDA_VERSION=24.7.1 ARG CONDA_CHECKSUM=2006a61abc8b4fd04de5eb92620e1f72bada713cc84b5b4899463095e1210556 ARG CONDA_PY_VERSION=39 ARG CONDA_PKG_VERSION=24.7.1 -ARG PYTHON_VERSION=3.9 +ARG PYTHON_VERSION=3.10 ARG PYARROW_VERSION=14.0.1 ARG MLIO_VERSION=v0.9.0 diff --git a/docker/1.2-1/extension/Dockerfile.cpu b/docker/1.2-2/extension/Dockerfile.cpu similarity index 100% rename from docker/1.2-1/extension/Dockerfile.cpu rename to docker/1.2-2/extension/Dockerfile.cpu diff --git a/docker/1.2-1/extension/README.md b/docker/1.2-2/extension/README.md similarity index 100% rename from docker/1.2-1/extension/README.md rename to docker/1.2-2/extension/README.md diff --git a/docker/1.2-1/final/Dockerfile.cpu b/docker/1.2-2/final/Dockerfile.cpu similarity index 91% rename from docker/1.2-1/final/Dockerfile.cpu rename to docker/1.2-2/final/Dockerfile.cpu index 51497401..f92f622c 100644 --- a/docker/1.2-1/final/Dockerfile.cpu +++ b/docker/1.2-2/final/Dockerfile.cpu @@ -1,5 +1,5 @@ FROM sklearn-base:1.2-1 -ENV SAGEMAKER_SKLEARN_VERSION 1.2-1 +ENV SAGEMAKER_SKLEARN_VERSION 1.2-2 ENV PIP_ROOT_USER_ACTION=ignore LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true @@ -9,8 +9,8 @@ RUN python -m pip install -r /requirements.txt && \ rm /requirements.txt COPY dist/sagemaker_sklearn_container-2.0-py3-none-any.whl /sagemaker_sklearn_container-2.0-py3-none-any.whl -RUN rm /miniconda3/lib/python3.9/site-packages/**/REQUESTED && \ - rm /miniconda3/lib/python3.9/site-packages/**/direct_url.json +RUN rm /miniconda3/lib/python3.10/site-packages/**/REQUESTED && \ + rm /miniconda3/lib/python3.10/site-packages/**/direct_url.json RUN pip install --no-cache /sagemaker_sklearn_container-2.0-py3-none-any.whl && \ rm /sagemaker_sklearn_container-2.0-py3-none-any.whl diff --git a/docker/1.2-1/resources/libffi7_3.3-6_arm64.deb b/docker/1.2-2/resources/libffi7_3.3-6_arm64.deb similarity index 100% rename from docker/1.2-1/resources/libffi7_3.3-6_arm64.deb rename to docker/1.2-2/resources/libffi7_3.3-6_arm64.deb diff --git a/docker/1.2-1/resources/mms/ExecutionParameters.java b/docker/1.2-2/resources/mms/ExecutionParameters.java similarity index 100% rename from docker/1.2-1/resources/mms/ExecutionParameters.java rename to docker/1.2-2/resources/mms/ExecutionParameters.java diff --git a/docker/1.2-1/resources/mms/config.properties.tmp b/docker/1.2-2/resources/mms/config.properties.tmp similarity index 100% rename from docker/1.2-1/resources/mms/config.properties.tmp rename to docker/1.2-2/resources/mms/config.properties.tmp diff --git a/docker/1.2-1/resources/mms/endpoints-1.0.jar b/docker/1.2-2/resources/mms/endpoints-1.0.jar similarity index 100% rename from docker/1.2-1/resources/mms/endpoints-1.0.jar rename to docker/1.2-2/resources/mms/endpoints-1.0.jar diff --git a/requirements.txt b/requirements.txt index a3825d83..ba2e1aab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ itsdangerous==2.0.1 gunicorn==23.0.0 model-archiver==1.0.3 multi-model-server==1.1.1 -pandas==1.1.3 +pandas==1.4.0 protobuf==3.20.2 psutil==5.7.2 python-dateutil==2.8.1 @@ -25,4 +25,5 @@ gevent==23.9.1 Werkzeug==2.0.3 setuptools wheel -certifi \ No newline at end of file +certifi +PyYAML==6.0.1 \ No newline at end of file diff --git a/setup.py b/setup.py index e72eb67a..3f4e84cc 100644 --- a/setup.py +++ b/setup.py @@ -34,6 +34,7 @@ def read(fname): "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ], install_requires=read("requirements.txt"), diff --git a/test-requirements.txt b/test-requirements.txt index 41afc3b5..8e94ffe5 100755 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,6 @@ Flask PyYAML boto3>=1.24.17 coverage -docker-compose flake8 mock pytest diff --git a/test.parquet b/test.parquet new file mode 100644 index 0000000000000000000000000000000000000000..fc5c45b6cc589f35e87dc657c4a185a059300378 GIT binary patch literal 1648 zcmcIlO^@0}7#;{k8!3lXR3jsCKvuKrVRwtYunkdi7)Suqg#<{jaa67RwZ>o%u0PhW ztNk&(^wb~HV~_ngeP;}4iT2V%M}m3heV%#VXU4DL6CR6Pfva*qT)~81B6R#Vhq961 z&K%-ia-~zikGUdOtnf!Wgg@GGOX$ZZvLNuhO38&>?pglipIn72lpCmcT;_9YE?+8? z{>qj9&Ykp5j{b{knR-E79>Lc!ObCJOX#?@a$ei20PLaZ^Jk&s?Lb+0|{EwCC2?{4i zaEk8{DxdPjKqruYo6B|eFSH`TBA!V+>23879LTR5!>ME7k-ki_#~ z6~%fO!?MQWRRE#HLYs!-!>_Q&^sbq>y_G#wxp8gJx<1Thwyxt%K+6dUam|&LIY|6q zvj?OYTdAiFL77(545 zctHFMJRW~k-ej%A|5^Nr4$*02j7RXH;}?wUxaHsu#tv>fEZ1rs;3-Xh*yF<#V7i9E zR2VK}oMHfAW+E`}NHd69=}c)XXX*ed&VbhXS@yj|>rU&cG`ux>)7T&b_oLe~>`gz^ zfh#Xoj!gP*@1^<_DcY#4h((oy--G*p%*G+Xo?`XKulupgKkm+*)PwQX?&&(uCb_URdxPNPH z*qJ3w?ceE2Ghxqm@u7CLz{z0JZytKoJd+FqL#i{4!K6-k?hWlV`f0JI8_^jWxr?!h z-$R-4ST!(OzD20WK9ofrcAeB{0{NeKo5UQ?D)(Kf;09KR<|!% UHGBQal?wbo|Nb39pWwgdUq9Wq6951J literal 0 HcmV?d00001 diff --git a/test/utils/local_mode.py b/test/utils/local_mode.py index ec74fa0a..95d73764 100644 --- a/test/utils/local_mode.py +++ b/test/utils/local_mode.py @@ -12,6 +12,12 @@ # language governing permissions and limitations under the License. from __future__ import absolute_import +# Fix for Python 3.10+ compatibility +import collections +import collections.abc +if not hasattr(collections, 'Mapping'): + collections.Mapping = collections.abc.Mapping + import json import logging import os From eab3279fb5227addf7876c79a12826ac88305577 Mon Sep 17 00:00:00 2001 From: Xinyun-123 Date: Mon, 8 Sep 2025 17:29:04 +0000 Subject: [PATCH 2/4] feat: upgrade python version --- docker/{1.2-2 => 1.2-1-1}/base/Dockerfile.cpu | 0 docker/{1.2-2 => 1.2-1-1}/extension/Dockerfile.cpu | 0 docker/{1.2-2 => 1.2-1-1}/extension/README.md | 0 docker/{1.2-2 => 1.2-1-1}/final/Dockerfile.cpu | 2 +- .../resources/libffi7_3.3-6_arm64.deb | Bin .../resources/mms/ExecutionParameters.java | 0 .../resources/mms/config.properties.tmp | 0 .../resources/mms/endpoints-1.0.jar | Bin 8 files changed, 1 insertion(+), 1 deletion(-) rename docker/{1.2-2 => 1.2-1-1}/base/Dockerfile.cpu (100%) rename docker/{1.2-2 => 1.2-1-1}/extension/Dockerfile.cpu (100%) rename docker/{1.2-2 => 1.2-1-1}/extension/README.md (100%) rename docker/{1.2-2 => 1.2-1-1}/final/Dockerfile.cpu (98%) rename docker/{1.2-2 => 1.2-1-1}/resources/libffi7_3.3-6_arm64.deb (100%) rename docker/{1.2-2 => 1.2-1-1}/resources/mms/ExecutionParameters.java (100%) rename docker/{1.2-2 => 1.2-1-1}/resources/mms/config.properties.tmp (100%) rename docker/{1.2-2 => 1.2-1-1}/resources/mms/endpoints-1.0.jar (100%) diff --git a/docker/1.2-2/base/Dockerfile.cpu b/docker/1.2-1-1/base/Dockerfile.cpu similarity index 100% rename from docker/1.2-2/base/Dockerfile.cpu rename to docker/1.2-1-1/base/Dockerfile.cpu diff --git a/docker/1.2-2/extension/Dockerfile.cpu b/docker/1.2-1-1/extension/Dockerfile.cpu similarity index 100% rename from docker/1.2-2/extension/Dockerfile.cpu rename to docker/1.2-1-1/extension/Dockerfile.cpu diff --git a/docker/1.2-2/extension/README.md b/docker/1.2-1-1/extension/README.md similarity index 100% rename from docker/1.2-2/extension/README.md rename to docker/1.2-1-1/extension/README.md diff --git a/docker/1.2-2/final/Dockerfile.cpu b/docker/1.2-1-1/final/Dockerfile.cpu similarity index 98% rename from docker/1.2-2/final/Dockerfile.cpu rename to docker/1.2-1-1/final/Dockerfile.cpu index f92f622c..eba196e0 100644 --- a/docker/1.2-2/final/Dockerfile.cpu +++ b/docker/1.2-1-1/final/Dockerfile.cpu @@ -1,5 +1,5 @@ FROM sklearn-base:1.2-1 -ENV SAGEMAKER_SKLEARN_VERSION 1.2-2 +ENV SAGEMAKER_SKLEARN_VERSION 1.2-1-1 ENV PIP_ROOT_USER_ACTION=ignore LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true diff --git a/docker/1.2-2/resources/libffi7_3.3-6_arm64.deb b/docker/1.2-1-1/resources/libffi7_3.3-6_arm64.deb similarity index 100% rename from docker/1.2-2/resources/libffi7_3.3-6_arm64.deb rename to docker/1.2-1-1/resources/libffi7_3.3-6_arm64.deb diff --git a/docker/1.2-2/resources/mms/ExecutionParameters.java b/docker/1.2-1-1/resources/mms/ExecutionParameters.java similarity index 100% rename from docker/1.2-2/resources/mms/ExecutionParameters.java rename to docker/1.2-1-1/resources/mms/ExecutionParameters.java diff --git a/docker/1.2-2/resources/mms/config.properties.tmp b/docker/1.2-1-1/resources/mms/config.properties.tmp similarity index 100% rename from docker/1.2-2/resources/mms/config.properties.tmp rename to docker/1.2-1-1/resources/mms/config.properties.tmp diff --git a/docker/1.2-2/resources/mms/endpoints-1.0.jar b/docker/1.2-1-1/resources/mms/endpoints-1.0.jar similarity index 100% rename from docker/1.2-2/resources/mms/endpoints-1.0.jar rename to docker/1.2-1-1/resources/mms/endpoints-1.0.jar From b985f61c913c0104979d00878bb8dfe5806fbf0f Mon Sep 17 00:00:00 2001 From: Xinyun-123 Date: Mon, 8 Sep 2025 17:29:04 +0000 Subject: [PATCH 3/4] feat: upgrade python version --- docker/1.2-1-1/final/Dockerfile.cpu | 2 +- requirements.txt | 4 ++-- test.parquet | Bin 1648 -> 1648 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/1.2-1-1/final/Dockerfile.cpu b/docker/1.2-1-1/final/Dockerfile.cpu index eba196e0..b717c60f 100644 --- a/docker/1.2-1-1/final/Dockerfile.cpu +++ b/docker/1.2-1-1/final/Dockerfile.cpu @@ -1,4 +1,4 @@ -FROM sklearn-base:1.2-1 +FROM sklearn-base:1.2-1-1 ENV SAGEMAKER_SKLEARN_VERSION 1.2-1-1 ENV PIP_ROOT_USER_ACTION=ignore diff --git a/requirements.txt b/requirements.txt index ba2e1aab..34de7e78 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ itsdangerous==2.0.1 gunicorn==23.0.0 model-archiver==1.0.3 multi-model-server==1.1.1 -pandas==1.4.0 +pandas==1.5.3 protobuf==3.20.2 psutil==5.7.2 python-dateutil==2.8.1 @@ -15,7 +15,7 @@ sagemaker-containers==2.8.6.post2 sagemaker-inference==1.2.0 sagemaker-training==4.8.0 scikit-learn==1.2.1 -scipy==1.8.0 +scipy==1.9.3 urllib3==1.26.17 six==1.15.0 jinja2==3.0.3 diff --git a/test.parquet b/test.parquet index fc5c45b6cc589f35e87dc657c4a185a059300378..9579c6c19aeb3a22ecb83d46ccc421827fb979e6 100644 GIT binary patch delta 25 hcmeys^MPl>A0}o~J>$*)nNBmY82V)SPCm!F2mpuR3IPBB delta 25 hcmeys^MPl>A0}oKJ%i2vnNBmY82Ds4PCm!F2mps(3Ge^_ From 773379e34da2ca80a108841c8383053fe74a44f8 Mon Sep 17 00:00:00 2001 From: Xinyun-123 Date: Fri, 12 Sep 2025 18:20:19 +0000 Subject: [PATCH 4/4] feat: only upgrade python version --- docker/1.2-1-1/base/Dockerfile.cpu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/1.2-1-1/base/Dockerfile.cpu b/docker/1.2-1-1/base/Dockerfile.cpu index fd1d88f0..16278337 100644 --- a/docker/1.2-1-1/base/Dockerfile.cpu +++ b/docker/1.2-1-1/base/Dockerfile.cpu @@ -25,8 +25,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ FROM ubuntu:${UBUNTU_VERSION}@sha256:${UBUNTU_IMAGE_DIGEST} ARG MINICONDA_VERSION=24.7.1 -ARG CONDA_CHECKSUM=2006a61abc8b4fd04de5eb92620e1f72bada713cc84b5b4899463095e1210556 -ARG CONDA_PY_VERSION=39 +ARG CONDA_CHECKSUM=684cda724bc37e3bbbb342e440fc4cac515c92e91a489eb4359feca35382894b +ARG CONDA_PY_VERSION=310 ARG CONDA_PKG_VERSION=24.7.1 ARG PYTHON_VERSION=3.10 ARG PYARROW_VERSION=14.0.1