[#1149] Fix duplicate requirements

ckan · Aug 1, 2013 · f64907b · f64907b
1 parent 5b35011
commit f64907b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,10 +1,10 @@
 # These are packages that required when running ckan tests
 
 -e git+https://github.com/okfn/ckanclient@a315a72eef74dda4831acd022ef84a1246803c73#egg=ckanclient-dev
+-e git+https://github.com/nvie/pip-tools@future#egg=pip-tools
 docutils==0.8.1
 httpretty==0.6.0
 nose==1.2.1
 pep8==1.4.6
--e git+https://github.com/nvie/pip-tools@future#egg=pip-tools
 Sphinx==1.2b1
 polib==1.0.3
diff --git a/requirements.in b/requirements.in
@@ -9,7 +9,6 @@ WebTest==1.4.3  # need to pin this so that Pylons does not install a newer versi
 apachemiddleware>=0.1.1
 fanstatic==0.12
 FormAlchemy>=1.4.2
-MarkupSafe>=0.15
 ofs>=0.4.1
 Pairtree>=0.7.1-T
 paste>=1.7.5.1

diff --git a/requirements.txt b/requirements.txt
@@ -22,12 +22,9 @@ WebTest==1.4.3
 apachemiddleware==0.1.1
 argparse==1.1
 decorator==3.4.0
-distribute==0.7.3
 fanstatic==0.12
-markupsafe==0.18
 nose==1.3.0
 ofs==0.4.1
-paste==1.7.5.1
 psycopg2==2.4.5
 python-dateutil==1.5
 python-openid==2.2.5
@@ -44,5 +41,4 @@ solrpy==0.9.5
 sqlalchemy-migrate==0.7.2
 unicodecsv==0.9.4
 vdm==0.11
-webob==1.2.3
 zope.interface==4.0.5