Skip to content

Commit

Permalink
[#1149] Move minimum requirements to a separate file
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz committed Aug 1, 2013
1 parent 1d51b38 commit af630ae
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 51 deletions.
3 changes: 2 additions & 1 deletion dev-requirements.txt
@@ -1,9 +1,10 @@
# 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.4.5
pep8==1.4.6
pip-tools==0.3.1
Sphinx==1.2b1
polib==1.0.3
30 changes: 30 additions & 0 deletions requirements.in
@@ -0,0 +1,30 @@
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
5 changes: 3 additions & 2 deletions requirements.txt
@@ -1,7 +1,8 @@
# 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
# 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
# like: pip install -r requirements.txt. See the Install from Source docs

apachemiddleware==0.1.1
Babel==0.9.6
Beaker==1.6.4
Expand Down
48 changes: 0 additions & 48 deletions setup.py
Expand Up @@ -7,52 +7,6 @@

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__,
Expand All @@ -63,8 +17,6 @@
description=__description__,
keywords='data packaging component tool server',
long_description =__long_description__,
install_requires=install_requires,
extras_require={'dev': dev_requires},
zip_safe=False,
packages=find_packages(exclude=['ez_setup']),
namespace_packages=['ckanext', 'ckanext.stats'],
Expand Down

0 comments on commit af630ae

Please sign in to comment.