update: Bump awscli version and constrain spyder on conda (#153)

* Update awscli version and constrain spyder on conda

Author: saimidu

docker/1.3.1/py2/Dockerfile.cpu

@@ -61,7 +61,6 @@ RUN curl -o ~/miniconda.sh -O  https://repo.continuum.io/miniconda/Miniconda3-la
  && /opt/conda/bin/conda install -y -c anaconda \
     python=$PYTHON_VERSION \
     numpy==1.16.4 \
-    scipy==1.2.1 \
     ipython==5.8.0 \
     mkl==2019.4 \
     mkl-include==2019.4 \
@@ -70,12 +69,12 @@ RUN curl -o ~/miniconda.sh -O  https://repo.continuum.io/miniconda/Miniconda3-la
     /opt/conda/bin/conda clean -ya
 
 RUN conda install -c conda-forge \
-    awscli==1.16.296 \
+    awscli==1.17.7 \
     opencv==4.0.1 \
  && conda install -y \
     scikit-learn==0.20.3 \
     pandas==0.24.2 \
-    pillow==6.2.1 \
+    Pillow==6.2.0 \
     h5py==2.9.0 \
     requests==2.22.0 \
  && conda clean -ya \
@@ -90,6 +89,7 @@ COPY sagemaker_pytorch_container-1.3.1-py2.py3-none-any.whl /sagemaker_pytorch_c
 # The following section uninstalls torch and torchvision before installing the
 # custom versions from an S3 bucket. This will need to be removed in the future
 RUN pip install --no-cache-dir \
+    scipy==1.2.2 \
     /sagemaker_pytorch_container-1.3.1-py2.py3-none-any.whl \
  && pip uninstall -y torch \
  && pip install -U --no-cache-dir https://pytorch-aws.s3.amazonaws.com/pytorch-1.3.1/py2/cpu/torch-1.3.1-cp27-cp27mu-manylinux1_x86_64.whl \

docker/1.3.1/py2/Dockerfile.gpu

@@ -89,7 +89,6 @@ RUN ompi_info --parsable --all | grep mpi_built_with_cuda_support:value \
  && /opt/conda/bin/conda install -y anaconda \
     python=$PYTHON_VERSION \
     numpy==1.16.4 \
-    scipy==1.2.1 \
     ipython==5.8.0 \
     mkl==2019.4 \
     mkl-include==2019.4 \
@@ -100,14 +99,19 @@ RUN ompi_info --parsable --all | grep mpi_built_with_cuda_support:value \
 
 RUN conda install -c pytorch magma-cuda101==2.5.1 \
  && conda install -c conda-forge \
-    awscli==1.16.296 \
+    awscli==1.17.7 \
     opencv==4.0.1 \
  && conda install -y \
     scikit-learn==0.20.3 \
     pandas==0.24.2 \
-    pillow==6.2.1 \
+    Pillow==6.2.0 \
     h5py==2.9.0 \
     requests==2.22.0 \
+ && pip install -U \
+    scipy==1.2.2 \
+    "spyder<4.0" \
+    argparse \
+ && pip uninstall -y QDarkStyle \
  && conda clean -ya
 
 # The following section uninstalls torch and torchvision before installing the

docker/1.3.1/py3/Dockerfile.cpu

@@ -69,20 +69,19 @@ RUN curl -o ~/miniconda.sh -O  https://repo.continuum.io/miniconda/Miniconda3-la
  && /opt/conda/bin/conda install -y -c anaconda \
     python=$PYTHON_VERSION \
     numpy==1.16.4 \
-    scipy==1.3.0 \
     ipython==7.10.1 \
     mkl==2019.4 \
     mkl-include==2019.4 \
     cython==0.29.12 \
     typing==3.6.4 \
     "pyopenssl>=17.5.0" \
  && conda install -c conda-forge \
-    awscli==1.16.314 \
+    awscli==1.17.7 \
     opencv==4.0.1 \
  && conda install -y \
     scikit-learn==0.21.2 \
     pandas==0.25.0 \
-    pillow==6.2.1 \
+    Pillow==6.2.0 \
     h5py==2.9.0 \
     requests==2.22.0 \
  && conda install -c dglteam -y dgl==0.4.1 \
@@ -93,7 +92,9 @@ RUN curl -o ~/miniconda.sh -O  https://repo.continuum.io/miniconda/Miniconda3-la
 # custom versions from an S3 bucket. This will need to be removed in the future
 RUN pip install --upgrade pip --trusted-host pypi.org --trusted-host files.pythonhosted.org \
  && ln -s /opt/conda/bin/pip /usr/local/bin/pip3 \
- && pip install --no-cache-dir fastai==1.0.59 \
+ && pip install --no-cache-dir -U \
+    fastai==1.0.59 \
+    scipy==1.2.2 \
     smdebug==0.5.0.post0 \
     sagemaker-experiments==0.1.3 \
     /sagemaker_pytorch_container-1.3.1-py2.py3-none-any.whl \

docker/1.3.1/py3/Dockerfile.gpu

@@ -83,7 +83,6 @@ RUN ompi_info --parsable --all | grep mpi_built_with_cuda_support:value \
  && /opt/conda/bin/conda install -y -c anaconda \
     python=$PYTHON_VERSION \
     numpy==1.16.4 \
-    scipy==1.3.0 \
     ipython==7.10.1 \
     mkl==2019.4 \
     mkl-include==2019.4 \
@@ -96,11 +95,11 @@ RUN ompi_info --parsable --all | grep mpi_built_with_cuda_support:value \
 
 RUN conda install -c pytorch magma-cuda101==2.5.1 \
  && conda install -c conda-forge \
-    awscli==1.16.314 \
+    awscli==1.17.7 \
     opencv==4.0.1 \
  && conda install -y scikit-learn==0.21.2 \
     pandas==0.25.0 \
-    pillow==6.2.1 \
+    Pillow==6.2.0 \
     h5py==2.9.0 \
     requests==2.22.0 \
  && conda clean -ya
@@ -123,6 +122,7 @@ RUN pip install \
     --no-cache-dir smdebug==0.5.0.post0 \
     sagemaker-experiments==0.1.3 \
     --no-cache-dir fastai==1.0.59 \
+    scipy==1.2.2 \
  && pip install --no-cache-dir -U https://pytorch-aws.s3.amazonaws.com/pytorch-1.3.1/py3/gpu/torch-1.3.1-cp36-cp36m-manylinux1_x86_64.whl \
  && pip uninstall -y torchvision \
  && pip install --no-cache-dir -U \

setup.py

@@ -46,7 +46,7 @@ def read(fname):
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.6',
     ],
-    install_requires=['numpy==1.16.4', 'Pillow==6.2.0', 'retrying==1.3.3', 'sagemaker-containers==2.5.11',
+    install_requires=['numpy==1.16.4', 'Pillow==6.2.0', 'retrying==1.3.3', 'sagemaker-containers>=2.6.2',
                       'six==1.12.0', 'torch==1.3.1'],
     extras_require={
         'test': ['boto3==1.9.169', 'coverage==4.5.3', 'docker-compose==1.23.2', 'flake8==3.7.7', 'Flask==1.1.1',