version no longer optional arg for process_config_file

Signed-off-by: Joffrey F <[email protected]>

compose/config/config.py

@@ -315,7 +315,7 @@ def load_services(working_dir, config_files, version):
     return build_services(config_file)
 
 
-def process_config_file(config_file, service_name=None, version=None):
+def process_config_file(config_file, version, service_name=None):
     validate_top_level_service_objects(config_file, version)
     processed_config = interpolate_environment_variables(config_file.config, version)
     validate_against_fields_schema(
@@ -364,7 +364,7 @@ class ServiceExtendsResolver(object):
 
         extended_file = process_config_file(
             ConfigFile.from_filename(config_path),
-            service_name=service_name, version=self.version
+            version=self.version, service_name=service_name
         )
         service_config = extended_file.config[service_name]
         return config_path, service_config, service_name

compose/project.py

@@ -234,7 +234,7 @@ class Project(object):
                 volume.create()
         except NotFound:
             raise ConfigurationError(
-                'Volume %s sepcifies nonexistent driver %s' % (volume.name, volume.driver)
+                'Volume %s specifies nonexistent driver %s' % (volume.name, volume.driver)
             )
 
     def restart(self, service_names=None, **options):

tests/integration/project_test.py

@@ -512,14 +512,14 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(len(service.containers()), 1)
 
     def test_project_up_volumes(self):
-        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            2, [{
+            version=2, services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], {vol_name: {'driver': 'local'}}
+            }], volumes={vol_name: {'driver': 'local'}}
         )
 
         project = Project.from_config(
@@ -534,14 +534,14 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Driver'], 'local')
 
     def test_initialize_volumes(self):
-        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            2, [{
+            version=2, services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], {vol_name: {}}
+            }], volumes={vol_name: {}}
         )
 
         project = Project.from_config(
@@ -555,14 +555,14 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Driver'], 'local')
 
     def test_project_up_implicit_volume_driver(self):
-        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        vol_name = '{0:x}'.format(random.getrandbits(32))
         full_vol_name = 'composetest_{0}'.format(vol_name)
         config_data = config.Config(
-            2, [{
+            version=2, services=[{
                 'name': 'web',
                 'image': 'busybox:latest',
                 'command': 'top'
-            }], {vol_name: {}}
+            }], volumes={vol_name: {}}
         )
 
         project = Project.from_config(
@@ -576,7 +576,7 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(volume_data['Driver'], 'local')
 
     def test_project_up_invalid_volume_driver(self):
-        vol_name = 'composetests_{0:x}'.format(random.getrandbits(32))
+        vol_name = '{0:x}'.format(random.getrandbits(32))
 
         config_data = config.Config(
             2, [{

tests/unit/config/config_test.py

@@ -702,7 +702,7 @@ class ConfigTest(unittest.TestCase):
                 'dns_search': 'domain.local',
             }
         }))
-        assert actual == [
+        assert actual.services == [
             {
                 'name': 'web',
                 'image': 'alpine',