diff --git a/docker/1.2-1/base/Dockerfile.cpu b/docker/1.2-1-1/base/Dockerfile.cpu similarity index 98% rename from docker/1.2-1/base/Dockerfile.cpu rename to docker/1.2-1-1/base/Dockerfile.cpu index 52c575b9..16278337 100644 --- a/docker/1.2-1/base/Dockerfile.cpu +++ b/docker/1.2-1-1/base/Dockerfile.cpu @@ -25,10 +25,10 @@ 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.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-1-1/extension/Dockerfile.cpu similarity index 100% rename from docker/1.2-1/extension/Dockerfile.cpu rename to docker/1.2-1-1/extension/Dockerfile.cpu diff --git a/docker/1.2-1/extension/README.md b/docker/1.2-1-1/extension/README.md similarity index 100% rename from docker/1.2-1/extension/README.md rename to docker/1.2-1-1/extension/README.md diff --git a/docker/1.2-1/final/Dockerfile.cpu b/docker/1.2-1-1/final/Dockerfile.cpu similarity index 90% rename from docker/1.2-1/final/Dockerfile.cpu rename to docker/1.2-1-1/final/Dockerfile.cpu index 51497401..b717c60f 100644 --- a/docker/1.2-1/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-1 +FROM sklearn-base:1.2-1-1 +ENV SAGEMAKER_SKLEARN_VERSION 1.2-1-1 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-1-1/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-1-1/resources/libffi7_3.3-6_arm64.deb diff --git a/docker/1.2-1/resources/mms/ExecutionParameters.java b/docker/1.2-1-1/resources/mms/ExecutionParameters.java similarity index 100% rename from docker/1.2-1/resources/mms/ExecutionParameters.java rename to docker/1.2-1-1/resources/mms/ExecutionParameters.java diff --git a/docker/1.2-1/resources/mms/config.properties.tmp b/docker/1.2-1-1/resources/mms/config.properties.tmp similarity index 100% rename from docker/1.2-1/resources/mms/config.properties.tmp rename to docker/1.2-1-1/resources/mms/config.properties.tmp diff --git a/docker/1.2-1/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-1/resources/mms/endpoints-1.0.jar rename to docker/1.2-1-1/resources/mms/endpoints-1.0.jar diff --git a/requirements.txt b/requirements.txt index a3825d83..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.1.3 +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 @@ -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 00000000..9579c6c1 Binary files /dev/null and b/test.parquet differ 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