From 8b5d32d338e340c714b8e1590e9f3363d962ddb3 Mon Sep 17 00:00:00 2001 From: Ian Murray Date: Tue, 21 Aug 2012 11:35:41 +0100 Subject: [PATCH] Re-instate requires/ files. This is for building the package only. The definitive list is still pip-requirements.txt --- requires/lucid_conflict.txt | 16 ++++++++++++++++ requires/lucid_missing.txt | 18 ++++++++++++++++++ requires/lucid_present.txt | 24 ++++++++++++++++++++++++ requires/precise_conflict.txt | 17 +++++++++++++++++ requires/precise_missing.txt | 18 ++++++++++++++++++ requires/precise_present.txt | 16 ++++++++++++++++ 6 files changed, 109 insertions(+) create mode 100644 requires/lucid_conflict.txt create mode 100644 requires/lucid_missing.txt create mode 100644 requires/lucid_present.txt create mode 100644 requires/precise_conflict.txt create mode 100644 requires/precise_missing.txt create mode 100644 requires/precise_present.txt diff --git a/requires/lucid_conflict.txt b/requires/lucid_conflict.txt new file mode 100644 index 00000000000..400f04aff0b --- /dev/null +++ b/requires/lucid_conflict.txt @@ -0,0 +1,16 @@ +# These are packages where we require a different version of a package from +# the one in Lucid. Rather than packaging a backport which could potentially +# interfere with a user's other installed software, we put these modules into +# a single location which CKAN imports from in preference to the Lucid +# equivalent. + +Genshi==0.6 +sqlalchemy-migrate==0.7.2 +sqlalchemy==0.7.8 +webhelpers==1.3 + +babel==0.9.6 +tempita==0.5.1 +zope.interface==4.0.1 +routes==1.13 +paste==1.7.5.1 diff --git a/requires/lucid_missing.txt b/requires/lucid_missing.txt new file mode 100644 index 00000000000..3f310ab517f --- /dev/null +++ b/requires/lucid_missing.txt @@ -0,0 +1,18 @@ +# These are packages that we rely on that aren't present in Lucid. We package +# them and put them in our own CKAN repository + +# Packages we install from source (could perhaps use release versions) +# vdm>=0.10,<0.11.99 +-e git+https://github.com/okfn/vdm.git@vdm-0.11#egg=vdm + +# Packages already on pypi.python.org +pyutilib.component.core==4.5.3 + +solrpy==0.9.5 +formalchemy==1.4.2 +pairtree==0.7.1-T +ofs==0.4.1 + +apachemiddleware==0.1.1 +# markupsafe is required by webhelpers==1.2 required by formalchemy with SQLAlchemy 0.6 +markupsafe==0.15 diff --git a/requires/lucid_present.txt b/requires/lucid_present.txt new file mode 100644 index 00000000000..447448600f8 --- /dev/null +++ b/requires/lucid_present.txt @@ -0,0 +1,24 @@ +# These CKAN dependencies are already in Lucid and should be installed via +# 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-pybabel python-psycopg2 python-lxml +# sudo apt-get install python-pylons python-repoze.who +# sudo apt-get install python-repoze.who-plugins python-tempita python-zope.interface + +psycopg2==2.0.13 +# Specifying particular version of WebOb because later version has incompatibility +# with pylons 0.9.7 (change to imports of Multidict) +webob==1.0.8 +Pylons==0.9.7 +repoze.who==1.0.19 +# These are both combined into the python-repoze.who-plugins package +repoze.who.plugins.openid==0.5.3 +# Actually from python-repoze.who-plugins but the openid plugin in the same +# package is too old +repoze.who-friendlyform==1.0.8 +pastescript==1.7.3 + +# NOTE: Developers, please do not edit the versions, these versions are fixed +# in Lucid. If you start to depend on a different vesion you'll need to +# remove the version here and package your version as a conflict. diff --git a/requires/precise_conflict.txt b/requires/precise_conflict.txt new file mode 100644 index 00000000000..54a6b15a514 --- /dev/null +++ b/requires/precise_conflict.txt @@ -0,0 +1,17 @@ +# These are packages where we require a different version of a package from +# the one in Lucid. Rather than packaging a backport which could potentially +# interfere with a user's other installed software, we put these modules into +# a single location which CKAN imports from in preference to the Lucid +# equivalent. + +sqlalchemy-migrate==0.7.2 +sqlalchemy==0.7.8 +webhelpers==1.3 + +zope.interface==4.0.1 +routes==1.13 +webob==1.0.8 +Pylons==0.9.7 +repoze.who==1.0.19 +repoze.who.plugins.openid==0.5.3 +repoze.who-friendlyform==1.0.8 diff --git a/requires/precise_missing.txt b/requires/precise_missing.txt new file mode 100644 index 00000000000..3f310ab517f --- /dev/null +++ b/requires/precise_missing.txt @@ -0,0 +1,18 @@ +# These are packages that we rely on that aren't present in Lucid. We package +# them and put them in our own CKAN repository + +# Packages we install from source (could perhaps use release versions) +# vdm>=0.10,<0.11.99 +-e git+https://github.com/okfn/vdm.git@vdm-0.11#egg=vdm + +# Packages already on pypi.python.org +pyutilib.component.core==4.5.3 + +solrpy==0.9.5 +formalchemy==1.4.2 +pairtree==0.7.1-T +ofs==0.4.1 + +apachemiddleware==0.1.1 +# markupsafe is required by webhelpers==1.2 required by formalchemy with SQLAlchemy 0.6 +markupsafe==0.15 diff --git a/requires/precise_present.txt b/requires/precise_present.txt new file mode 100644 index 00000000000..3314f2e85da --- /dev/null +++ b/requires/precise_present.txt @@ -0,0 +1,16 @@ +Genshi==0.6 +babel==0.9.6 +tempita==0.5.1 +paste==1.7.5.1 + +psycopg2==2.4.5 +# Specifying particular version of WebOb because later version has incompatibility +# with pylons 0.9.7 (change to imports of Multidict) +# These are both combined into the python-repoze.who-plugins package +# Actually from python-repoze.who-plugins but the openid plugin in the same +# package is too old +pastescript==1.7.5.1 + +# NOTE: Developers, please do not edit the versions, these versions are fixed +# in Lucid. If you start to depend on a different vesion you'll need to +# remove the version here and package your version as a conflict.