Include check in charmcraft.yaml for base info for local charms

Fixes #765

Author: cderici

juju/model.py

@@ -1797,27 +1797,26 @@ async def deploy(
                 # We have a local charm dir that needs to be uploaded
                 charm_dir = os.path.abspath(os.path.expanduser(identifier))
                 charm_origin = res.origin
+                base = None
 
                 metadata = utils.get_local_charm_metadata(charm_dir)
                 charm_series = charm_series or await get_charm_series(metadata,
                                                                       self)
 
-                # If we're using a newer client, then the CharmOrigin needs a
-                # base
-                if not self.connection().is_using_old_client:
-                    charm_origin.base = utils.get_local_charm_base(charm_series,
-                                                                   channel,
-                                                                   metadata,
-                                                                   charm_dir,
-                                                                   client.Base)
-
+                if not self.connection().is_using_old_client or \
+                        not charm_series:
+                    base = utils.get_local_charm_base(charm_series,
+                                                      channel,
+                                                      metadata,
+                                                      charm_dir,
+                                                      client.Base)
+                    charm_origin.base = base
                 if not application_name:
                     application_name = metadata['name']
-                if self.connection().is_using_old_client and not charm_series:
+                if base is None and charm_series is None:
                     raise JujuError(
-                        "Couldn't determine series for charm at {}. "
-                        "Pass a 'series' kwarg to Model.deploy().".format(
-                            charm_dir))
+                        "Either series or base is needed to deploy the "
+                        "charm at {}. ".format(charm_dir))
                 identifier = await self.add_local_charm_dir(charm_dir,
                                                             charm_series)
                 resources = await self.add_local_resources(application_name,

juju/utils.py

@@ -239,7 +239,7 @@ def get_local_charm_data(path, yaml_file):
 
     :patam str path: Path of charm directory or .charm file
     :patam str yaml_file: name of the yaml file, can be either
-    "metadata.yaml", or "manifest.yaml"
+    "metadata.yaml", or "manifest.yaml", or "charmcraft.yaml"
 
     :return: Object of charm metadata
     """
@@ -249,6 +249,8 @@ def get_local_charm_data(path, yaml_file):
     else:
         entity_path = Path(path)
         metadata_path = entity_path / yaml_file
+        if not metadata_path.exists():
+            return {}
         metadata = yaml.load(metadata_path.read_text(), Loader=yaml.FullLoader)
 
     return metadata
@@ -262,6 +264,10 @@ def get_local_charm_manifest(path):
     return get_local_charm_data(path, 'manifest.yaml')
 
 
+def get_local_charm_charmcraft_yaml(path):
+    return get_local_charm_data(path, 'charmcraft.yaml')
+
+
 PRECISE = "precise"
 QUANTAL = "quantal"
 RARING = "raring"
@@ -376,6 +382,12 @@ def get_local_charm_base(series, channel_from_arg, charm_metadata,
         if 'bases' in charm_manifest:
             channel_for_base = charm_manifest['bases'][0]['channel']
             os_name_for_base = charm_manifest['bases'][0]['name']
+        else:
+            # Also check the charmcraft.yaml
+            charmcraft_yaml = get_local_charm_charmcraft_yaml(charm_path)
+        if 'bases' in charmcraft_yaml:
+            channel_for_base = charmcraft_yaml['bases'][0]['run-on'][0]['channel']
+            os_name_for_base = charmcraft_yaml['bases'][0]['run-on'][0]['name']
 
     if channel_for_base == '':
         raise errors.JujuError("Unable to determine base for charm : %s" %