Changeset 3816

Timestamp:

06/23/11 14:19:34 (11 months ago)

Author:

elemoine

Message:

sample - upgrade to Map Fish? 2.2

Location:

sample/trunk

Files:

• buildout.cfg (modified) (6 diffs)
• setup.py (modified) (1 diff)

sample/trunk/buildout.cfg

@@ -19 +19 @@
 Beaker = 1.5.4
 FormEncode = 1.2.2
-GeoAlchemy = 0.4.1
+GeoAlchemy = 0.6
 JSTools = 0.1.5
 Mako = 0.3.6
@@ -28 +28 @@
 Pylons = 1.0
 Routes = 1.12.3
-SQLAlchemy = 0.6.5
+SQLAlchemy = 0.7.1
 Shapely = 1.2.8
 Tempita = 0.4
@@ -45 +45 @@
 httplib2 = 0.6.0
 iw.recipe.fetcher = 0.2
-mapfish = 2.0
+mapfish = 2.2
 nose = 1.0.0
 psycopg2 = 2.2.2
@@ -51 +51 @@
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
-FormAlchemy = 1.3.5
-GeoFormAlchemy = 0.2
+FormAlchemy = 1.4
+GeoFormAlchemy = 0.3
 c2c.recipe.jarfile = 0.4.2
 #Required by:
@@ -70 +70 @@
 # project instance id
 instanceid = override_me
+# the Unix user under which the modwsgi daemon processes are executed,
+# can be overriden in development-specific buildout config files
+modwsgi_user = www-data
 # apache entry point for Apache rewrite rules (see apache/wsgi.conf.in)
 apache-entry-point = /${vars:instanceid}/wsgi
@@ -91 +94 @@
 dbport = 5432
 # database name
-db = v2.0_mapfishsample
+db = v2.2_mapfishsample
 # postgresql version
 pg_version = 8.3

sample/trunk/setup.py

@@ -15 +15 @@
     install_requires=[
         "psycopg2>=2.2.0,<=2.2.99",
-        "mapfish>=2.0,<=2.0.99",
+        "mapfish>=2.0,<=2.2.99",
         "httplib2>=0.6.0,<=0.6.99",
         "Babel<=0.9.99",
         "TileCache>=2.10,<=2.10.99",
-        "GeoFormAlchemy>=0.2,<=0.2.99",
+        "GeoFormAlchemy>=0.2,<=0.3.99",
     ],
     #setup_requires=["PasteScript>=1.6.3"],