Merge Changes Upstream?

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "docs/_build/html"]
 	path = docs/_build/html
-	url = git@github.com:dinoboff/skeleton.git
+	url = https://github.com/dinoboff/skeleton.git

HISTORY.rst

@@ -1,6 +1,12 @@
 History
 =======
 
+0.6-ll (Sep 27, 2012)
+--------------------
+
+Fork for Location Labs.
+
+
 0.6 (Mai 12, 2010)
 --------------------
 

setup.py

@@ -5,7 +5,6 @@
 distribute_setup.use_setuptools()
 
 import sys
-
 from setuptools import setup
 
 
@@ -22,7 +21,9 @@ def read_file(name):
 
 
 PROJECT = 'skeleton'
-VERSION = '0.6-ypr'
+VERSION = '0.6.2-ll'
+# Jenkins will replace __build__ with a unique value.
+__build__ = ''
 URL = 'http://dinoboff.github.com/skeleton'
 AUTHOR = 'Damien Lebrun'
 AUTHOR_EMAIL = 'dinoboff@gmail.com'
@@ -36,7 +37,7 @@ def read_file(name):
 
 setup(
     name=PROJECT,
-    version=VERSION,
+    version=VERSION + __build__,
     description=DESC,
     long_description=LONG_DESC,
     author=AUTHOR,
@@ -47,18 +48,20 @@ def read_file(name):
     test_suite='skeleton.tests',
     include_package_data=True,
     zip_safe=False,
-    install_requires=[],
+    install_requires=[
+        'jinja2'
+    ],
     extras_require={
         'virtualenv-templates':  [
             'virtualenvwrapper>=2.1.1',
             'virtualenvwrapper.project>=1.0'
-            ],
+        ],
     },
     entry_points={
         'virtualenvwrapper.project.template': [
             'package = skeleton.examples.basicpackage:virtualenv_warpper_hook',
-            ],
-        },
+        ],
+    },
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',
@@ -68,6 +71,6 @@ def read_file(name):
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.1',
-        ],
+    ],
     **EXTRAS
 )

skeleton/__init__.py

@@ -5,6 +5,7 @@
 """
 
 from skeleton.core import (
-    Skeleton, Var, Bool, FileNameKeyError, TemplateKeyError
+    Skeleton, Var, Bool, DependentVar, FileNameKeyError, TemplateKeyError,
+    Validator, RegexValidator
     )
 from skeleton.utils import insert_into_file