From 865ed6f8eabe94e48509cc70336637b7f385af91 Mon Sep 17 00:00:00 2001 From: Alexander Schepanovski Date: Fri, 29 Nov 2019 23:42:26 +0100 Subject: [PATCH 1/2] test: skip non supported remotes fast in api tests --- tests/func/test_api.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/func/test_api.py b/tests/func/test_api.py index ddf101479..a970d3cd5 100644 --- a/tests/func/test_api.py +++ b/tests/func/test_api.py @@ -75,7 +75,7 @@ def run_dvc(*argv): @pytest.mark.parametrize("remote_url", remote_params, indirect=True) -def test_get_url(repo_dir, dvc_repo, remote_url): +def test_get_url(remote_url, repo_dir, dvc_repo): run_dvc("remote", "add", "-d", "upstream", remote_url) dvc_repo.add(repo_dir.FOO) @@ -84,7 +84,7 @@ def test_get_url(repo_dir, dvc_repo, remote_url): @pytest.mark.parametrize("remote_url", remote_params, indirect=True) -def test_get_url_external(dvc_repo, erepo, remote_url): +def test_get_url_external(remote_url, dvc_repo, erepo): _set_remote_url_and_commit(erepo.dvc, remote_url) # Using file url to force clone to tmp repo @@ -94,7 +94,7 @@ def test_get_url_external(dvc_repo, erepo, remote_url): @pytest.mark.parametrize("remote_url", all_remote_params, indirect=True) -def test_open(repo_dir, dvc_repo, remote_url): +def test_open(remote_url, repo_dir, dvc_repo): run_dvc("remote", "add", "-d", "upstream", remote_url) dvc_repo.add(repo_dir.FOO) run_dvc("push") @@ -107,7 +107,7 @@ def test_open(repo_dir, dvc_repo, remote_url): @pytest.mark.parametrize("remote_url", all_remote_params, indirect=True) -def test_open_external(dvc_repo, erepo, remote_url): +def test_open_external(remote_url, dvc_repo, erepo): erepo.dvc.scm.checkout("branch") _set_remote_url_and_commit(erepo.dvc, remote_url) erepo.dvc.scm.checkout("master") @@ -127,7 +127,7 @@ def test_open_external(dvc_repo, erepo, remote_url): @pytest.mark.parametrize("remote_url", all_remote_params, indirect=True) -def test_missing(repo_dir, dvc_repo, remote_url): +def test_missing(remote_url, repo_dir, dvc_repo): run_dvc("add", repo_dir.FOO) run_dvc("remote", "add", "-d", "upstream", remote_url) From f09517ad09f0021c38738fb863319db94ad2ca39 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sat, 30 Nov 2019 20:11:11 +0200 Subject: [PATCH 2/2] travis: windows: use python 3.7.5 --- scripts/ci/before_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/before_install.sh b/scripts/ci/before_install.sh index 9bf8a7eac..bf5c9fa78 100644 --- a/scripts/ci/before_install.sh +++ b/scripts/ci/before_install.sh @@ -48,7 +48,7 @@ if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install python2 echo 'PATH="/c/Python27:/c/Python27/Scripts:$PATH"' >> env.sh else - choco install python --version 3.7.4 + choco install python --version 3.7.5 echo 'PATH="/c/Python37:/c/Python37/Scripts:$PATH"' >> env.sh fi elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then