dvc: bump to 1.0.0a9

This one doesn't allow us to release new pre-releases, because pypi
forbids that:

https://travis-ci.com/github/iterative/dvc/jobs/343343967#L2447

Let's install it separately for now, until there is a new official
mock-ssh-server release.

dvc/command/plots.py

@@ -209,5 +209,5 @@ def _add_output_arguments(parser):
         "--show-vega",
         action="store_true",
         default=False,
-        help="Show output in VEGA format.",
+        help="Show output in Vega format.",
     )

dvc/version.py

@@ -6,7 +6,7 @@
 import os
 import subprocess
 
-_BASE_VERSION = "1.0.0a8"
+_BASE_VERSION = "1.0.0a9"
 
 
 def _generate_version(base_version):

scripts/ci/install.sh

@@ -10,6 +10,8 @@ scriptdir="$(dirname $0)"
 # work or not.
 $scriptdir/retry.sh pip install .[all,tests]
 
+$scriptdir/retry.sh pip install git+https://github.com/iterative/mock-ssh-server.git
+
 git config --global user.email "[email protected]"
 git config --global user.name "DVC Tester"
 

scripts/completion/dvc.bash

@@ -47,8 +47,8 @@ _dvc_move_COMPGEN=_dvc_compgen_files
 _dvc_params='diff'
 _dvc_params_diff='--all --show-json --show-md --no-path'
 _dvc_plots='show diff'
-_dvc_plots_show='-t --template -o --out -x -y --show-json --no-csv-header --title --x-label --y-label'
-_dvc_plots_diff='-t --template --targets -o --out -x -y --show-json --no-csv-header --title --x-label --y-label'
+_dvc_plots_show='-t --template -o --out -x -y --show-vega --no-csv-header --title --x-label --y-label'
+_dvc_plots_diff='-t --template --targets -o --out -x -y --show-vega --no-csv-header --title --x-label --y-label'
 _dvc_plots_modify='-t --template -x -y --no-csv-header --title --x-label --y-label'
 _dvc_pull='-j --jobs -r --remote -a --all-branches -T --all-tags -f --force -d --with-deps -R --recursive'
 _dvc_pull_COMPGEN=_dvc_compgen_DVCFiles

setup.py

@@ -121,7 +121,7 @@ tests_requirements = [
     "flake8-docstrings",
     "pydocstyle<4.0",
     "jaraco.windows==3.9.2",
-    "mock-ssh-server@git+https://github.com/iterative/mock-ssh-server.git",
+    "mock-ssh-server",
     "moto==1.3.14.dev464",
     "rangehttpserver==1.2.0",
     "beautifulsoup4==4.4.0",

tests/func/test_data_cloud.py

@@ -189,26 +189,22 @@ class TestS3Remote(S3, TestDataCloudBase):
         return S3Remote
 
 
-def setup_gdrive_cloud(remote_url, dvc):
-    config = copy.deepcopy(TEST_CONFIG)
-    config["remote"][TEST_REMOTE] = {
-        "url": remote_url,
-        "gdrive_service_account_email": "test",
-        "gdrive_service_account_p12_file_path": "test.p12",
-        "gdrive_use_service_account": True,
-    }
-
-    dvc.config = config
-    remote = DataCloud(dvc).get_remote()
-    remote._gdrive_create_dir("root", remote.path_info.path)
-
-
 class TestGDriveRemote(GDrive, TestDataCloudBase):
     def _setup_cloud(self):
         self._ensure_should_run()
 
-        setup_gdrive_cloud(self.get_url(), self.dvc)
+        url = self.get_url()
+        self.create_dir(self.dvc, url)
 
+        config = copy.deepcopy(TEST_CONFIG)
+        config["remote"][TEST_REMOTE] = {
+            "url": url,
+            "gdrive_service_account_email": "test",
+            "gdrive_service_account_p12_file_path": "test.p12",
+            "gdrive_use_service_account": True,
+        }
+
+        self.dvc.config = config
         self.cloud = DataCloud(self.dvc)
         remote = self.cloud.get_remote()
         self.assertIsInstance(remote, self._get_cloud_class())
@@ -421,12 +417,11 @@ class TestS3RemoteCLI(S3, TestDataCloudCLIBase):
 
 
 class TestGDriveRemoteCLI(GDrive, TestDataCloudCLIBase):
-    def _setup_cloud(self):
-        setup_gdrive_cloud(self.get_url(), self.dvc)
-
     def _test(self):
         url = self.get_url()
 
+        self.create_dir(self.dvc, url)
+
         self.main(["remote", "add", TEST_REMOTE, url])
         self.main(
             [
@@ -434,7 +429,7 @@ class TestGDriveRemoteCLI(GDrive, TestDataCloudCLIBase):
                 "modify",
                 TEST_REMOTE,
                 "gdrive_service_account_email",
-                "modified",
+                "test",
             ]
         )
         self.main(
@@ -443,7 +438,7 @@ class TestGDriveRemoteCLI(GDrive, TestDataCloudCLIBase):
                 "modify",
                 TEST_REMOTE,
                 "gdrive_service_account_p12_file_path",
-                "modified.p12",
+                "test.p12",
             ]
         )
         self.main(

tests/remotes.py

@@ -141,10 +141,21 @@ class GDrive:
     def should_test():
         return os.getenv(GDriveRemote.GDRIVE_CREDENTIALS_DATA) is not None
 
-    def get_url(self):
-        if not getattr(self, "_remote_url", None):
-            self._remote_url = "gdrive://root/" + str(uuid.uuid4())
-        return self._remote_url
+    @staticmethod
+    def create_dir(dvc, url):
+        config = {
+            "url": url,
+            "gdrive_service_account_email": "test",
+            "gdrive_service_account_p12_file_path": "test.p12",
+            "gdrive_use_service_account": True,
+        }
+        remote = GDriveRemote(dvc, config)
+        remote._gdrive_create_dir("root", remote.path_info.path)
+
+    @staticmethod
+    def get_url():
+        # NOTE: `get_url` should always return new random url
+        return "gdrive://root/" + str(uuid.uuid4())
 
 
 class Azure: