[ckan-changes] commit/ckan: thejimmyg: Making Babel a present requirement, not a conflicting one #1168

[Bitbucket]

1 new changeset in ckan:

http://bitbucket.org/okfn/ckan/changeset/2c7204535297/
changeset:   2c7204535297
user:        thejimmyg
date:        2011-06-16 10:37:07
summary:     Making Babel a present requirement, not a conflicting one #1168
affected #:  3 files (178 bytes)

--- a/requires/lucid_conflict.txt	Tue Jun 14 12:27:53 2011 +0200
+++ b/requires/lucid_conflict.txt	Thu Jun 16 09:37:07 2011 +0100
@@ -4,7 +4,6 @@
 # a single location which CKAN imports from in preference to the Lucid 
 # equivalent.
 
-Babel>=0.9.5
 Genshi>=0.6,<0.6.99
 sqlalchemy-migrate==0.6
 sqlalchemy==0.6.6


--- a/requires/lucid_missing.txt	Tue Jun 14 12:27:53 2011 +0200
+++ b/requires/lucid_missing.txt	Thu Jun 16 09:37:07 2011 +0100
@@ -13,6 +13,8 @@
 -e git+https://github.com/wwaites/autoneg.git@b4c727b164f411cc9d60#egg=autoneg
 # flup>=0.5
 -e hg+http://hg.saddi.com/flup@301a58656bfb#egg=flup
+# All the conflicting dependencies from the lucid_conflict.txt file
+-e hg+https://bitbucket.org/okfn/ckan-deps@6287665a1965#egg=ckan-deps
 
 # NOTE: Developers, our build script for the Debian packages relies on the 
 #       requirements above being specified as editable resources with their


--- a/requires/lucid_present.txt	Tue Jun 14 12:27:53 2011 +0200
+++ b/requires/lucid_present.txt	Thu Jun 16 09:37:07 2011 +0100
@@ -2,10 +2,11 @@
 # apt-get if you are on that platform. If you are using a different platform
 # you can install these dependencies via pip instead.
 #
-# sudo apt-get install python-psycopg2 python-lxml python-sphinx 
+# sudo apt-get install python-psycopg2 python-lxml python-sphinx python-pybabel
 # sudo apt-get install python-pylons python-formalchemy python-repoze.who
 # sudo apt-get install python-repoze.who-plugins python-tempita python-zope.interface
 
+babel==0.9.4
 psycopg2==2.0.13
 lxml==2.2.4
 sphinx==0.6.4

Repository URL: https://bitbucket.org/okfn/ckan/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.