adding better string resolution

scripts/uranium

@@ -5,9 +5,9 @@
 # * run uranium
 
 VENV_URL = "https://pypi.python.org/packages/source/v/virtualenv/virtualenv-{major}.{minor}.{rev}.tar.gz"
-VENV_MAJOR = 1
-VENV_MINOR = 11
-VENV_REV = 6
+VENV_MAJOR = 12
+VENV_MINOR = 0
+VENV_REV = 5
 
 import io
 import logging

setup.py

@@ -2,14 +2,14 @@
 from setuptools import setup, find_packages
 
 install_requires = [
-    'setuptools==12.0.3',
+    'setuptools==12.0.5',
     'docopt==0.6.2',
     'jinja2==2.7.3',
     'pip==6.0.6',
     'pyyaml==3.11',
     'requests==2.5.1',
     'six==1.9.0',
-    'virtualenv==12.0.5',
+    'virtualenv==12.0.6',
     'zc.buildout'
 ]
 
@@ -19,7 +19,7 @@
 ]
 
 setup(name='uranium',
-      version='0.0.57',
+      version='0.0.60',
       description='a build system for python',
       long_description='a build system for python',
       author='Yusuke Tsutsumi',

uranium/__init__.py

@@ -25,7 +25,7 @@
     install_virtualenv, inject_into_activate_this
 )
 from .config import Config
-from uranium.activate import generate_activate_this
+from .activate import generate_activate_this
 import os
 import sys
 

uranium/config/__init__.py

@@ -1,4 +1,3 @@
-import copy
 import requests
 import yaml
 from ..part import Part
@@ -88,14 +87,16 @@ def _set_values(to_dict, raw_options):
     * download all values from the inheritance list
     * fold those values into the raw_options dictionary
     """
+    _recursive_merge(to_dict, raw_options)
+
     inheritance_list = raw_options.get(INHERITANCE_KEY)
+
     if inheritance_list:
 
         for inherited_path in inheritance_list:
             inherited_values = _load_values_from_path(inherited_path)
             _set_values(to_dict, inherited_values)
 
-    _recursive_merge(to_dict, raw_options)
 
 
 def _recursive_merge(to_dict, from_dict):

uranium/tests/test_config.py

@@ -23,6 +23,8 @@ def test_inheritance(self):
         eq_(self.config.get("index"), "http://my-index.local",
             "value should have been inherited from base.yaml!")
 
+        eq_(self.config.get("config"), "uranium")
+
         parts = self.config["parts"]
         ok_('zeromq' in parts,
             "value should have been inherited indirectly through zeromq.yaml")

uranium/tests/test_files/uranium.yaml

@@ -1,5 +1,6 @@
 inherits:
   - "./base.yaml"
+config: "uranium"
 parts:
   uranium:
     another: key

uranium/tests/test_files/zeromq.yaml

@@ -1,3 +1,4 @@
+config: "zeromq"
 parts:
   zeromq:
     some: dict