change: upgrade pytest and other deps, tox clean-up (#1836)

Author: metrizable

buildspec.yml

@@ -16,7 +16,7 @@ phases:
 
       - start_time=`date +%s`
       - |
-        execute-command-if-has-matching-changes "env -u AWS_DEFAULT_REGION tox -e py38 -- tests/integ -m \"not local_mode\" -n 512 --reruns 3 --reruns-delay 5 --durations 50 --boto-config '{\"region_name\": \"us-east-2\"}'" "tests/integ" "tests/scripts" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"
+        execute-command-if-has-matching-changes "env -u AWS_DEFAULT_REGION tox -e py38 -- tests/integ -m \"not local_mode and not cron\" -n 512 --reruns 3 --reruns-delay 5 --durations 50 --boto-config '{\"region_name\": \"us-east-2\"}'" "tests/integ" "tests/scripts" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"
       - ./ci-scripts/displaytime.sh 'py38 tests/integ' $start_time
 
   post_build:

setup.py

@@ -59,16 +59,16 @@ def read_version():
 extras["test"] = (
     [
         extras["all"],
-        "tox==3.15.1",
+        "tox",
         "flake8",
-        "pytest==4.6.10",
+        "pytest",
         "pytest-cov",
         "pytest-rerunfailures",
         "pytest-xdist",
         "mock",
         "contextlib2",
         "awslogs",
-        "black==19.10b0 ; python_version >= '3.6'",
+        "black",
         "stopit==1.1.2",
         "apache-airflow==1.10.11",
         "fabric>=2.0",

tests/integ/test_git.py

@@ -222,7 +222,7 @@ def test_github_with_ssh_passphrase_not_configured(
 
     with pytest.raises(subprocess.CalledProcessError) as error:
         sklearn.fit({"train": train_input, "test": test_input})
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @pytest.mark.local_mode

tests/unit/sagemaker/model/test_framework_model.py

@@ -210,7 +210,7 @@ def test_git_support_git_clone_fail(sagemaker_session):
             sagemaker_session=sagemaker_session, entry_point=entry_point, git_config=git_config
         )
         model.prepare_container_def(instance_type=INSTANCE_TYPE)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -227,7 +227,7 @@ def test_git_support_branch_not_exist(git_clone_repo, sagemaker_session):
             sagemaker_session=sagemaker_session, entry_point=entry_point, git_config=git_config
         )
         model.prepare_container_def(instance_type=INSTANCE_TYPE)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -244,7 +244,7 @@ def test_git_support_commit_not_exist(git_clone_repo, sagemaker_session):
             sagemaker_session=sagemaker_session, entry_point=entry_point, git_config=git_config
         )
         model.prepare_container_def(instance_type=INSTANCE_TYPE)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -391,7 +391,7 @@ def test_git_support_ssh_passphrase_required(tar_and_upload_dir, git_clone_repo,
             sagemaker_session=sagemaker_session, entry_point=entry_point, git_config=git_config
         )
         model.prepare_container_def(instance_type=INSTANCE_TYPE)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -460,4 +460,4 @@ def test_git_support_codecommit_ssh_passphrase_required(
             sagemaker_session=sagemaker_session, entry_point=entry_point, git_config=git_config
         )
         model.prepare_container_def(instance_type=INSTANCE_TYPE)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)

tests/unit/sagemaker/tensorflow/test_estimator_init.py

@@ -138,4 +138,4 @@ def test_require_image_uri_if_fw_ver_is_less_than_1_11(
         "make sure to pass them directly as hyperparameters instead."
     ).format(version=tensorflow_training_version, region=REGION)
 
-    assert expected_msg in str(e)
+    assert expected_msg in str(e.value)

tests/unit/test_estimator.py

@@ -943,7 +943,7 @@ def test_git_support_git_clone_fail(sagemaker_session):
     )
     with pytest.raises(subprocess.CalledProcessError) as error:
         fw.fit()
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -964,7 +964,7 @@ def test_git_support_branch_not_exist(sagemaker_session):
     )
     with pytest.raises(subprocess.CalledProcessError) as error:
         fw.fit()
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -985,7 +985,7 @@ def test_git_support_commit_not_exist(sagemaker_session):
     )
     with pytest.raises(subprocess.CalledProcessError) as error:
         fw.fit()
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -1151,7 +1151,7 @@ def test_git_support_ssh_passphrase_required(git_clone_repo, sagemaker_session):
     )
     with pytest.raises(subprocess.CalledProcessError) as error:
         fw.fit()
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(

tests/unit/test_fw_utils.py

@@ -456,13 +456,13 @@ def test_model_code_key_prefix_and_image_present(time):
 def test_model_code_key_prefix_with_prefix_present_and_others_none_fail():
     with pytest.raises(TypeError) as error:
         fw_utils.model_code_key_prefix("prefix", None, None)
-    assert "expected string" in str(error)
+    assert "expected string" in str(error.value)
 
 
 def test_model_code_key_prefix_with_all_none_fail():
     with pytest.raises(TypeError) as error:
         fw_utils.model_code_key_prefix(None, None, None)
-    assert "expected string" in str(error)
+    assert "expected string" in str(error.value)
 
 
 def test_region_supports_debugger_feature_returns_true_for_supported_regions():

tests/unit/test_git_utils.py

@@ -95,7 +95,7 @@ def test_git_clone_repo_clone_fail(mkdtemp, check_call):
     dependencies = ["foo", "bar"]
     with pytest.raises(subprocess.CalledProcessError) as error:
         git_utils.git_clone_repo(git_config, entry_point, source_dir, dependencies)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -110,7 +110,7 @@ def test_git_clone_repo_branch_not_exist(mkdtemp, check_call):
     dependencies = ["foo", "bar"]
     with pytest.raises(subprocess.CalledProcessError) as error:
         git_utils.git_clone_repo(git_config, entry_point, source_dir, dependencies)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -129,7 +129,7 @@ def test_git_clone_repo_commit_not_exist(mkdtemp, check_call):
     dependencies = ["foo", "bar"]
     with pytest.raises(subprocess.CalledProcessError) as error:
         git_utils.git_clone_repo(git_config, entry_point, source_dir, dependencies)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch("subprocess.check_call")
@@ -358,7 +358,7 @@ def test_git_clone_repo_with_username_and_password_wrong_creds(mkdtemp, check_ca
     env["GIT_TERMINAL_PROMPT"] = "0"
     with pytest.raises(subprocess.CalledProcessError) as error:
         git_utils.git_clone_repo(git_config=git_config, entry_point=entry_point)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -381,7 +381,7 @@ def test_git_clone_repo_with_token_wrong_creds(mkdtemp, check_call):
     env["GIT_TERMINAL_PROMPT"] = "0"
     with pytest.raises(subprocess.CalledProcessError) as error:
         git_utils.git_clone_repo(git_config=git_config, entry_point=entry_point)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -404,7 +404,7 @@ def test_git_clone_repo_with_and_token_2fa_wrong_creds(mkdtemp, check_call):
     env["GIT_TERMINAL_PROMPT"] = "0"
     with pytest.raises(subprocess.CalledProcessError) as error:
         git_utils.git_clone_repo(git_config=git_config, entry_point=entry_point)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch("subprocess.check_call")
@@ -448,7 +448,7 @@ def test_git_clone_repo_codecommit_ssh_passphrase_required(mkdtemp, check_call):
     entry_point = "entry_point"
     with pytest.raises(subprocess.CalledProcessError) as error:
         git_utils.git_clone_repo(git_config, entry_point)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)
 
 
 @patch(
@@ -463,4 +463,4 @@ def test_git_clone_repo_codecommit_https_creds_not_stored_locally(mkdtemp, check
     entry_point = "entry_point"
     with pytest.raises(subprocess.CalledProcessError) as error:
         git_utils.git_clone_repo(git_config, entry_point)
-    assert "returned non-zero exit status" in str(error)
+    assert "returned non-zero exit status" in str(error.value)

tests/unit/test_multidatamodel.py

@@ -120,10 +120,10 @@ def test_multi_data_model_create_with_invalid_model_data_prefix():
         MultiDataModel(
             name=MODEL_NAME, model_data_prefix=invalid_model_data_prefix, image_uri=IMAGE, role=ROLE
         )
-    err_msg = 'ValueError: Expecting S3 model prefix beginning with "s3://". Received: "{}"'.format(
+    err_msg = 'Expecting S3 model prefix beginning with "s3://". Received: "{}"'.format(
         invalid_model_data_prefix
     )
-    assert err_msg in str(ex)
+    assert err_msg in str(ex.value)
 
 
 def test_multi_data_model_create_with_invalid_arguments(sagemaker_session, mxnet_model):
@@ -309,11 +309,9 @@ def test_add_model_with_invalid_model_uri(multi_data_model):
     with pytest.raises(ValueError) as ex:
         multi_data_model.add_model(INVALID_S3_URL)
 
-    assert 'ValueError: model_source must either be a valid local file path or s3 uri. Received: "{}"'.format(
+    assert 'model_source must either be a valid local file path or s3 uri. Received: "{}"'.format(
         INVALID_S3_URL
-    ) in str(
-        ex
-    )
+    ) in str(ex.value)
 
 
 def test_list_models(multi_data_model):

tests/unit/test_session.py

@@ -286,7 +286,7 @@ def test_get_execution_role_throws_exception_if_arn_is_not_role():
 
     with pytest.raises(ValueError) as error:
         get_execution_role(session)
-    assert "ValueError: The current AWS identity is not a role" in str(error)
+    assert "The current AWS identity is not a role" in str(error.value)
 
 
 def test_get_execution_role_throws_exception_if_arn_is_not_role_with_role_in_name():
@@ -295,7 +295,7 @@ def test_get_execution_role_throws_exception_if_arn_is_not_role_with_role_in_nam
 
     with pytest.raises(ValueError) as error:
         get_execution_role(session)
-    assert "ValueError: The current AWS identity is not a role" in str(error)
+    assert "The current AWS identity is not a role" in str(error.value)
 
 
 @patch("six.moves.builtins.open", mock_open(read_data='{"ResourceName": "SageMakerInstance"}'))