fix-requires pyramid

camptocamp · Aug 6, 2013 · 9c5cad3 · 9c5cad3
1 parent 05570a4
commit 9c5cad3
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 31 deletions.
diff --git a/setup.py b/setup.py
@@ -28,36 +28,39 @@
 ]
 
 setup(
-        name='tilecloud-chain',
-        version='0.7',
-        description='tilecloud chain',
-        long_description=README,
-        classifiers=[
-            'Development Status :: 4 - Beta',
-            'Environment :: Console',
-            'Intended Audience :: Developers',
-            'License :: OSI Approved :: BSD License',
-            'Programming Language :: Python',
-            'Topic :: Scientific/Engineering :: GIS',
+    name='tilecloud-chain',
+    version='0.7',
+    description='tilecloud chain',
+    long_description=README,
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Programming Language :: Python',
+        'Topic :: Scientific/Engineering :: GIS',
+    ],
+    author='Stéphane Brunner',
+    author_email='stephane.brunner@camptocamp.com',
+    url='http://github.com/sbrunner/tilecloud-chain',
+    license='BSD',
+    keywords='gis tilecloud chain',
+    packages=find_packages(exclude=["*.tests", "*.tests.*"]),
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=install_requires,
+    setup_requires=setup_requires,
+    tests_require=tests_require,
+    entry_points={
+        'console_scripts': [
+            'generate_tiles = tilecloud_chain.generate:main',
+            'generate_controller = tilecloud_chain.controller:main',
         ],
-        author='Stéphane Brunner',
-        author_email='stephane.brunner@camptocamp.com',
-        url='http://github.com/sbrunner/tilecloud-chain',
-        license='BSD',
-        keywords='gis tilecloud chain',
-        packages=find_packages(exclude=["*.tests", "*.tests.*"]),
-        include_package_data=True,
-        zip_safe=False,
-        install_requires=install_requires,
-        setup_requires=setup_requires,
-        tests_require=tests_require,
-        entry_points={
-            'console_scripts': [
-                'generate_tiles = tilecloud_chain.generate:main',
-                'generate_controller = tilecloud_chain.controller:main',
-            ],
-            'pyramid.scaffold': [
-                'tilecloud_chain = tilecloud_chain.scaffolds:Create',
-            ],
-        }
+        'pyramid.scaffold': [
+            'tilecloud_chain = tilecloud_chain.scaffolds:Create',
+        ],
+        'paste.app_factory': [
+            'server = tilecloud_chain.server:app_factory',
+        ],
+    }
 )
diff --git a/tilecloud_chain/server.py b/tilecloud_chain/server.py
@@ -358,6 +358,10 @@ def forward(self, url, headers={}):
             return [content]
 
 
+def app_factory(global_config, **local_conf):
+    return Server(local_conf.get('configfile', 'tilegeneration/config.yaml'))
+
+
 class PyramidView(Server):
 
     from pyramid.httpexceptions import HTTPNoContent, HTTPBadRequest, \