Revert temp boto3 fix and pin awscli/boto3 (#4509)

* test

* fix typo

* upgrade awscli

* remove fabric and invoke pins

* add awscli to requirements, add --upgrade

* same changes to test requirements

* pin awscli and boto3 to current latest versions; test pt inference 2.5 ec2

* test pt inference 2.5 sm

* Update ['dlc_developer_config.toml']

dlc_developer_config.toml:
{   'build': {   'build_frameworks': ['pytorch'],
                 'build_inference': True,
                 'build_training': False},
    'buildspec_override': {   'dlc-pr-pytorch-inference': 'pytorch/inference/buildspec-2-4-ec2.yml'},
    'dev': {   'arm64_mode': False,
               'deep_canary_mode': False,
               'graviton_mode': False,
               'neuronx_mode': False},
    'test': {   'ec2_tests': True,
                'ecs_tests': True,
                'eks_tests': True,
                'sagemaker_local_tests': True,
                'sagemaker_remote_tests': True,
                'sanity_tests': True,
                'security_tests': True}}

* Update ['dlc_developer_config.toml']

dlc_developer_config.toml:
{   'build': {   'build_frameworks': ['pytorch'],
                 'build_inference': True,
                 'build_training': False},
    'buildspec_override': {   'dlc-pr-pytorch-arm64-inference': 'pytorch/inference/buildspec-arm64-2-5-ec2.yml'},
    'dev': {   'arm64_mode': True,
               'deep_canary_mode': False,
               'graviton_mode': False,
               'neuronx_mode': False},
    'test': {   'ec2_tests': True,
                'ecs_tests': True,
                'eks_tests': True,
                'sagemaker_local_tests': True,
                'sagemaker_remote_tests': True,
                'sanity_tests': True,
                'security_tests': True}}

* Update ['dlc_developer_config.toml']

dlc_developer_config.toml:
{   'build': {   'build_frameworks': ['pytorch'],
                 'build_inference': False,
                 'build_training': True},
    'buildspec_override': {   'dlc-pr-pytorch-training': 'pytorch/training/buildspec-2-5-sm.yml'},
    'dev': {   'arm64_mode': False,
               'deep_canary_mode': False,
               'graviton_mode': False,
               'neuronx_mode': False},
    'test': {   'ec2_tests': True,
                'ecs_tests': True,
                'eks_tests': True,
                'sagemaker_local_tests': True,
                'sagemaker_remote_tests': True,
                'sanity_tests': True,
                'security_tests': True}}

* Update ['dlc_developer_config.toml']

dlc_developer_config.toml:
{   'build': {   'build_frameworks': ['tensorflow'],
                 'build_inference': True,
                 'build_training': False},
    'buildspec_override': {   'dlc-pr-tensorflow-2-inference': 'tensorflow/inference/buildspec-2-18-ec2.yml'},
    'dev': {   'arm64_mode': False,
               'deep_canary_mode': False,
               'graviton_mode': False,
               'neuronx_mode': False},
    'test': {   'ec2_tests': True,
                'ecs_tests': True,
                'eks_tests': True,
                'sagemaker_local_tests': True,
                'sagemaker_remote_tests': True,
                'sanity_tests': True,
                'security_tests': True}}

* Restore ['dlc_developer_config.toml']

dlc_developer_config.toml:
('Restore to '
 'https://raw.githubusercontent.com/aws/deep-learning-containers/master/dlc_developer_config.toml')

Author: sallyseok

src/patch_helper.py

@@ -305,9 +305,6 @@ def initiate_multithreaded_autopatch_prep(PRE_PUSH_STAGE_IMAGES, make_dummy_boto
         f"""pip install -r {os.path.join(os.sep, get_cloned_folder_path(), "test", "requirements.txt")}""",
         hide=False,
     )
-    # temporary workaround for breaking boto3 version
-    run("pip uninstall -y boto3 botocore s3transfer")
-    run("pip install boto3==1.35.75")  # minimum required version for sagemaker dependency currently
 
     folder_path_outside_clone = os.path.join(os.sep, *get_cloned_folder_path().split(os.sep)[:-1])
     download_path = os.path.join(os.sep, folder_path_outside_clone, "patch-dlc")

src/requirements.txt

@@ -1,12 +1,12 @@
+awscli==1.37.6
+boto3==1.36.6
+fabric
+invoke
 wheel==0.44.0
 docker==4.2.0
-fabric==2.5.0
-#unpin when fabric releases v3.1 Related Issue https://github.com/fabric/fabric/issues/2263
-invoke<2.1.0
 pyfiglet==0.8.post1
 reprint==0.5.2
 ruamel.yaml==0.18.10
-boto3>=1.33
 black==23.3.0
 junit-xml==1.9
 toml==0.10.2

test/requirements.txt

@@ -1,7 +1,7 @@
+boto3
 docker
 fabric
-#unpin when fabric releases v3.1 Related Issue https://github.com/fabric/fabric/issues/2263
-invoke<2.1.0
+invoke
 junit-xml==1.9
 packaging
 # Pin pytest to preserve pytest cache behavior
@@ -12,7 +12,6 @@ pytest-json-report
 pytest-xdist
 sagemaker>=2,<3
 xmltodict
-boto3>=1.33
 retrying
 gitpython
 pytz