Commits

Oliver Tonnhofer committed d188e64 Merge

merge with 1.4.x

Comments (0)

Files changed (5)

 520fb9b3d04afa450248e8857570dd5e97ec9a2d 1.3.0b1
 e358d9548c6d1d8d763f4e3ab5411b79237d4b78 1.3.0
 3d838b4b3874b8ed4c2c3186bbd507da8d32cce2 1.4.0rc1
+7e0e7405553a2954bc49c2c0538fa7baa25a2230 1.4.0
-1.4.0x 2012-05-xx
+1.4.0 2012-05-15
 ~~~~~~~~~~~~~~~~~
 
 Fixes:
 
+- fix TypeError exception when auth callback returns {authorized:'full'}
 - use MAPPROXY_LIB_PATH on platforms other that win32 and darwin
 - raise config error for mapnik sources when mapnik could not be imported
 
 # The short X.Y version.
 version = '1.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.0a'
+release = '1.4.1a'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 def upload_final_sdist_command():
     sh('python setup.py egg_info -b "" -D sdist upload')
 
+def register_command():
+    sh('python setup.py egg_info -b "" -D register')
+
 def link_latest_command(ver=None):
     if ver is None:
         ver = version()
 
 setup(
     name='MapProxy',
-    version="1.4.0a",
+    version="1.4.1a",
     description='An accelerating proxy for web map services',
     long_description=long_description(7),
     author='Oliver Tonnhofer',