Merge remote-tracking branch 'vitorbaptista/491'

ckan · Jun 8, 2013 · 85ad0c7 · 85ad0c7
2 parents 7771d4e + b2a531d
commit 85ad0c7
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 45 deletions.
diff --git a/.pipignore b/.pipignore
@@ -0,0 +1 @@
+ckan
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -22,7 +22,7 @@ Note
 ====
 
 CKAN is sometimes packaged directly with other software (listed in
-pip-requirements.txt, pip-requirements-test.txt and pip-requirements-docs.txt).
+requirements.txt and dev-requirements.txt).
 In these cases, we are required to list the licenses of the packaged softare
 too. They are all AGPL compatible and read as follows in the next sections.
 

diff --git a/bin/travis-build b/bin/travis-build
@@ -23,8 +23,7 @@ sudo -u postgres psql -c "CREATE USER datastore_default WITH PASSWORD 'pass';"
 sudo -u postgres psql -c 'CREATE DATABASE ckan_test WITH OWNER ckan_default;'
 sudo -u postgres psql -c 'CREATE DATABASE datastore_test WITH OWNER ckan_default;'
 
-pip install -r pip-requirements.txt --use-mirrors
-pip install -r pip-requirements-test.txt --use-mirrors
+pip install -r requirements.txt -r dev-requirements.txt --use-mirrors
 
 python setup.py develop
 

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -0,0 +1,8 @@
+# These are packages that required when running ckan tests
+-e git+https://github.com/okfn/ckanclient@a315a72eef74dda4831acd022ef84a1246803c73#egg=ckanclient-dev
+docutils==0.8.1
+httpretty==0.6.0
+nose==1.2.1
+pep8==1.3.3
+pip-tools==0.3.1
+Sphinx==1.2b1
diff --git a/doc/install-from-source.rst b/doc/install-from-source.rst
@@ -105,7 +105,7 @@ c. Install the Python modules that CKAN requires into your virtualenv:
 
    .. parsed-literal::
 
-       pip install -r |virtualenv|/src/ckan/pip-requirements.txt
+       pip install -r |virtualenv|/src/ckan/requirements.txt
 
 d. Deactivate and reactivate your virtualenv, to make sure you're using the
    virtualenv's copies of commands like ``paster`` rather than any system-wide

diff --git a/doc/test.rst b/doc/test.rst
@@ -25,7 +25,7 @@ environment:
 
 .. parsed-literal::
 
-    pip install -r |virtualenv|/src/ckan/pip-requirements-test.txt
+    pip install -r |virtualenv|/src/ckan/dev-requirements.txt
 
 -------------------
 Testing with SQLite

diff --git a/fabfile.py b/fabfile.py
@@ -75,7 +75,7 @@
 env.base_dir = os.getcwd() # e.g. /home/jsmith/var/srvc
 env.local_backup_dir = os.path.expanduser('~/db_backup')
 env.ckan_repo = 'https://github.com/okfn/ckan/raw/%s/'
-pip_requirements = 'pip-requirements.txt'
+pip_requirements = 'requirements.txt'
 env.skip_setup_db = False
 
 def config_local(base_dir, ckan_instance_name, db_user=None, db_host=None,
@@ -241,8 +241,8 @@ def deploy():
     pip_req = env.ckan_repo % env.revision + pip_requirements
     with cd(env.instance_path):
 
-        # get latest pip-requirements.txt
-        print 'Getting pip-requirements from revision: %s' % env.revision
+        # get latest requirements.txt
+        print 'Getting requirements from revision: %s' % env.revision
         latest_pip_file = urllib2.urlopen(pip_req)
         tmp_pip_requirements_filepath = os.path.join('/tmp', pip_requirements)
         local_pip_file = open(tmp_pip_requirements_filepath, 'w')

diff --git a/pip-requirements-docs.txt b/pip-requirements-docs.txt
diff --git a/pip-requirements-test.txt b/pip-requirements-test.txt
diff --git a/pip-requirements.txt → requirements.txt b/pip-requirements.txt → requirements.txt
@@ -1,33 +1,46 @@
-# This file lists CKAN's dependencies so that you can install them (e.g. into
 # a Python virtual environment) after you have installed CKAN, with a command
-# like: pip install -r pip-requirements.txt. See the Install from Source
 # instructions in CKAN's documentation for full installation instructions.
+# like: pip install -r requirements.txt. See the Install from Source
+# This file lists CKAN's dependencies so that you can install them (e.g. into
+apachemiddleware==0.1.1
+Babel==0.9.6
+Beaker==1.6.4
+decorator==3.4.0
+fanstatic==0.12
+FormAlchemy==1.4.2
+FormEncode==1.2.6
 Genshi==0.6
-sqlalchemy-migrate==0.7.2
-sqlalchemy==0.7.8
-webhelpers==1.3
-pyutilib.component.core==4.5.3
-vdm==0.11
-solrpy==0.9.5
-formalchemy==1.4.2
-pairtree==0.7.1-T
+Jinja2==2.6
+Mako==0.7.3
+MarkupSafe==0.15
 ofs==0.4.1
-apachemiddleware==0.1.1
-markupsafe==0.15
-babel==0.9.6
+Pairtree==0.7.1-T
+Paste==1.7.5.1
+PasteDeploy==1.5.0
+PasteScript==1.7.5
 psycopg2==2.4.5
-webob==1.0.8
+Pygments==1.6
 Pylons==0.9.7
-repoze.who==1.0.19
-tempita==0.5.1
-zope.interface==4.0.1
-repoze.who.plugins.openid==0.5.3
+python-dateutil==1.5
+python-openid==2.2.5
+pyutilib.component.core==4.5.3
+repoze.lru==0.6
 repoze.who-friendlyform==1.0.8
-routes==1.13
-paste==1.7.5.1
-Jinja2==2.6
-fanstatic==0.12
+repoze.who.plugins.openid==0.5.3
+repoze.who==1.0.19
 requests==1.1.0
+Routes==1.13
+simplejson==3.1.2
+solrpy==0.9.5
+sqlalchemy-migrate==0.7.2
+SQLAlchemy==0.7.8
+Tempita==0.5.1
+unicodecsv==0.9.0
+vdm==0.11
+verlib==0.1
+virtualenv==1.9.1
+WebError==0.10.3
+WebHelpers==1.3
+WebOb==1.0.8
 WebTest==1.4.3
-python-dateutil>=1.5.0,<2.0.0
-unicodecsv==0.9
+zope.interface==4.0.1
diff --git a/setup.py b/setup.py
@@ -7,6 +7,52 @@
 
 from ckan import __version__, __description__, __long_description__, __license__
 
+install_requires = [
+    'Babel>=0.9.6',
+    'Genshi==0.6',
+    'Jinja2>=2.6',
+    'Pylons==0.9.7',
+    'WebTest==1.4.3',  # need to pin this so that Pylons does not install a newer version that conflicts with WebOb==1.0.8
+    'apachemiddleware>=0.1.1',
+    'babel>=0.9.6',
+    'fanstatic==0.12',
+    'formalchemy>=1.4.2',
+    'markupsafe>=0.15',
+    'ofs>=0.4.1',
+    'pairtree>=0.7.1-T',
+    'paste>=1.7.5.1',
+    'psycopg2==2.4.5',
+    'python-dateutil>=1.5.0,<2.0.0',
+    'pyutilib.component.core>=4.5.3',
+    'repoze.who-friendlyform>=1.0.8',
+    'repoze.who.plugins.openid>=0.5.3',
+    'repoze.who==1.0.19',
+    'requests==1.1.0',
+    'routes>=1.13',
+    'solrpy>=0.9.5',
+    'sqlalchemy-migrate>=0.7.2',
+    'sqlalchemy==0.7.8',
+    'tempita>=0.5.1',
+    'vdm>=0.11',
+    'webhelpers>=1.3',
+    'webob==1.0.8',
+    'zope.interface>=4.0.1',
+    'unicodecsv>=0.9',
+]
+
+dev_requires = [
+    'ckanclient>=0.10',
+    'docutils>=0.8.1',
+    'httpretty>=0.5',
+    'nose>=1.2.1',
+    'pip-tools>=0.3.1',
+    'Sphinx>=1.2b1',
+]
+
+dependency_links = [
+    'https://github.com/okfn/ckanclient/tarball/master#egg=ckanclient'
+]
+
 setup(
     name='ckan',
     version=__version__,
@@ -17,10 +63,8 @@
     description=__description__,
     keywords='data packaging component tool server',
     long_description =__long_description__,
-    install_requires=[
-    ],
-    extras_require = {
-    },
+    install_requires=install_requires,
+    extras_require={'dev': dev_requires},
     zip_safe=False,
     packages=find_packages(exclude=['ez_setup']),
     namespace_packages=['ckanext', 'ckanext.stats'],