Updating vendored deps. and minor updates to config system.

Author: pombredanne

etc/conf/base.txt

@@ -1,6 +1,6 @@
 # Base
 certifi==14.05.14
-setuptools==5.6
+setuptools==7.0
 wheel==0.24.0
 pip==1.5.6
 

etc/getconf.py

@@ -40,6 +40,8 @@
 On posix, posix Python and shell scripts are executed before mac or linux 
 scripts.
 
+The base scripts or packages are always installed first before platform-specific ones. 
+
 For example a tree could be looking like this::
     etc/conf
         base.txt : base pip requirements for all platforms
@@ -81,10 +83,10 @@
 base = ('base',)
 
 # known full file names with txt extension for requirements
-requirements = tuple(p + '.txt' for p in base + platform_names)
+requirements = tuple(p + '.txt' for p in platform_names + base)
 
 # known full file names with py extensions for scripts
-python_scripts = tuple(p + '.py' for p in base + platform_names)
+python_scripts = tuple(p + '.py' for p in platform_names + base)
 
 # known full file names of shell scripts
 shell_scripts = tuple(p + '.sh' for p in platform_names)

thirdparty/MarkupSafe.ABOUT

@@ -9,7 +9,7 @@ dje_license: bsd-new
 
 vcs_tool: git
 vcs_repository: https://github.com/mitsuhiko/jinja2.git
-license_text_file:MarkupSafe.LICENSE
+license_text_file: MarkupSafe.LICENSE
 
 copyright: Copyright (c) 2010 by Armin Ronacher and contributors.
 owner: Armin Ronacher

thirdparty/pip.ABOUT

@@ -2,7 +2,7 @@ about_resource: pip-1.5.6-py2.py3-none-any.whl
 version: 1.5.6
 download_url: https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#md5=01026f87978932060cc86c1dc527903e
 
-name:pip
+name: pip
 owner: The pip developers
 contact: [email protected]
 home_url: http://www.pip-installer.org

…arty/setuptools-5.6-py2.py3-none-any.whl …arty/setuptools-7.0-py2.py3-none-any.whlthirdparty/setuptools-5.6-py2.py3-none-any.whl renamed to thirdparty/setuptools-7.0-py2.py3-none-any.whl thirdparty/setuptools-5.6-py2.py3-none-any.whl renamed to thirdparty/setuptools-7.0-py2.py3-none-any.whl

@@ -1,8 +1,8 @@
-about_resource: setuptools-5.6-py2.py3-none-any.whl
+about_resource: setuptools-7.0-py2.py3-none-any.whl
 name: setuptools
-version: 5.6
+version: 7.0
 
-download_url: https://pypi.python.org/packages/3.4/s/setuptools/setuptools-5.6-py2.py3-none-any.whl#md5=4503e42d67edc51e293ba9be4af799a5
+download_url: https://pypi.python.org/packages/3.4/s/setuptools/setuptools-7.0-py2.py3-none-any.whl#md5=918e7e5ea108507e1ffbbdfccc3496b1
 
 home_url: https://pypi.python.org/pypi/setuptools
 owner: Python Packaging Authority

thirdparty/setuptools.ABOUT

@@ -0,0 +1,17 @@
+about_resource: virtualenv-1.11.6-py2.py3-none-any.whl
+version: 1.11.6
+download_url: https://raw.githubusercontent.com/pypa/virtualenv/1.11.6/virtualenv.py
+
+vcs_tool: git
+vcs_repository: https://github.com/pypa/virtualenv.git
+
+name: virtualenv
+home_url: http://virtualenv.org/
+owner: The virtualenv developers
+
+license_url: https://raw.github.com/pypa/virtualenv/develop/LICENSE.txt
+license_text_file: virtualenv.LICENSE
+dje_license: mit
+copyright: Copyright (c) 2007 Ian Bicking and Contributors
+ Copyright (c) 2009 Ian Bicking, The Open Planning Project
+ Copyright (c) 2011-2014 The virtualenv developers

thirdparty/virtualenv.ABOUT

@@ -1,10 +1,11 @@
-about_resource:wheel-0.24.0-py2.py3-none-any.whl
+about_resource: wheel-0.24.0-py2.py3-none-any.whl
 version: 0.24.0
 download_url: https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.24.0-py2.py3-none-any.whl#md5=4c24453cda2177fd42c5d62d6434679a
 
 name: wheel
+home_url: https://bitbucket.org/pypa/wheel
 vcs_tool: hg
-vcs_repository:https://bitbucket.org/pypa/wheel
+vcs_repository: https://bitbucket.org/pypa/wheel
 
 copyright: copyright (c) 2012-2014 Daniel Holth <[email protected]> and
  contributors.