Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-11 07:18:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into gs-external-deps

Browse Source 
* master:
  travis: windows: use python 3.7.5
  test: skip non supported remotes fast in api tests
This commit is contained in:
Saugat Pachhai
2019-12-01 09:01:47 +05:45
parent 7e62a7d7e5 f09517ad09
commit f4f836e17c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/ci/before_install.sh
+1 -1
View File
@@ -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
tests/func/test_api.py
+5 -5
View File
@@ -23,7 +23,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)
@@ -32,7 +32,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
@@ -42,7 +42,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")
@@ -55,7 +55,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")
@@ -75,7 +75,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)