Merge pull request #483 from mesosphere/fix-#482

remove dcos dependency on dcoscli
dcos · Feb 22, 2016 · b8a9395 · b8a9395
2 parents 83bdfa1 + cf4d53d
commit b8a9395
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/dcos/auth.py b/dcos/auth.py
@@ -127,7 +127,7 @@ def _save_auth_keys(key_dict):
     section = 'core'
     config_schema = json.loads(
         pkg_resources.resource_string(
-            'dcoscli',
+            'dcos',
             'data/config-schema/core.json').decode('utf-8'))
     for k, v in iteritems(key_dict):
         python_value = jsonitem.parse_json_value(k, v, config_schema)

diff --git a/dcos/config.py b/dcos/config.py
@@ -211,7 +211,7 @@ def get_config_schema(command):
     if command == "core":
         return json.loads(
             pkg_resources.resource_string(
-                'dcoscli',
+                'dcos',
                 'data/config-schema/core.json').decode('utf-8'))
 
     executable = subcommand.command_executables(command)

diff --git a/cli/dcoscli/data/config-schema/core.json → dcos/data/config-schema/core.json b/cli/dcoscli/data/config-schema/core.json → dcos/data/config-schema/core.json
diff --git a/setup.py b/setup.py
@@ -78,4 +78,10 @@
         'six>=1.9, <2.0',
         'toml>=0.9, <1.0',
     ],
+
+    package_data={
+        'dcos': [
+            'data/config-schema/core.json',
+        ],
+    },
 )