From 39964ebe4efb52cb2fd9ffb1ba800b35fecd4977 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigosiqueiramelo@gmail.com>
Date: Mon, 26 Jan 2015 15:40:46 -0200
Subject: [PATCH] Updated installation script.

---
 .travis.yml          |  3 +--
 requirements.txt     | 51 ---------------------------------------------------
 requirements_dev.txt |  1 -
 setup.py             | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 vagrant/provision.sh |  1 -
 5 files changed, 64 insertions(+), 59 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/.travis.yml b/.travis.yml
index 233145c..84b19a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,8 @@ env:
   - DJANGO_VERSION=1.7.3
 
 install:
-  - pip install -r requirements_dev.txt
   - pip install django==${DJANGO_VERSION}
-  - pip install -e .
+  - pip install .
   - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
 
 before_script:
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 1113971..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Django>=1.7
-South==1.0.0
-psycopg2==2.5.1
-django-piston==0.2.3
-pytz==2011n
-chardet==1.0.1
-python-dateutil==1.5
-django-cliauth==0.9.1
-django-mobile==0.3.0
-django-haystack==2.1
-pysolr==2.1
-poster==0.8.1
-etiquetando==0.1
-html2text==3.200.3
-django-taggit==0.12.1
-python-memcached==1.53
-django-hitcounter==0.1.1
-Pillow==2.5.1
-django-i18n-model==0.0.7
-django-tastypie==0.11.0
-gunicorn==19.1.0
-eventlet==0.15.2
-PyYAML==3.11
-
-# Deps for sentry client (raven)
-raven==3.5.2
-tornado==3.1.1
-
-# Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9
-django-browserid==0.11
-django-revproxy==0.3.1
-
-# Converse.js (XMPP client)
-django-conversejs==0.3.4
-
-# Feedzilla (planet) and deps
-feedzilla==0.24
-django-common==0.1.51
-feedparser==5.1.3
-lxml==3.2.4
-grab==0.4.13
-transliterate==1.5
-
-# Diazo
-diazo==1.0.5
-
-# Dpaste
-dpaste==2.8
-
-# Mailman 2 REST API
-mailman-api==0.2.9
diff --git a/requirements_dev.txt b/requirements_dev.txt
index a32671a..1ccc322 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -2,4 +2,3 @@ Whoosh==2.5.7
 coverage==3.7.1
 coveralls==0.5
 flake8==2.3.0
--r requirements.txt
diff --git a/setup.py b/setup.py
index 4139590..2f63408 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,67 @@
 
 from setuptools import setup, find_packages
-from pip.req import parse_requirements
  
-reqs = [str(req.req) for req in parse_requirements('requirements.txt')
-        if req.req]
+
+REQUIREMENTS = [
+    'Django>=1.7',
+    'South==1.0.0',
+    'psycopg2==2.5.1',
+    'django-piston==0.2.3',
+    'pytz==2011n',
+    'chardet==1.0.1',
+    'python-dateutil==1.5',
+    'django-cliauth==0.9.1',
+    'django-mobile==0.3.0',
+    'django-haystack==2.1',
+    'pysolr==2.1',
+    'poster==0.8.1',
+    'etiquetando==0.1',
+    'html2text==3.200.3',
+    'django-taggit==0.12.1',
+    'python-memcached==1.53',
+    'django-hitcounter==0.1.1',
+    'Pillow==2.5.1',
+    'django-i18n-model==0.0.7',
+    'django-tastypie==0.11.0',
+    'gunicorn==19.1.0',
+    'eventlet==0.15.2',
+    'PyYAML==3.11',
+
+    # Deps for sentry client (raven)
+    'raven==3.5.2',
+    'tornado==3.1.1',
+
+    # Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9
+    'django-browserid==0.11',
+    'django-revproxy==0.3.1',
+
+    # Converse.js (XMPP client)
+    'django-conversejs==0.3.4',
+
+    # Feedzilla (planet) and deps
+    'feedzilla==0.24',
+    'django-common==0.1.51',
+    'feedparser==5.1.3',
+    'lxml==3.2.4',
+    'grab==0.4.13',
+    'transliterate==1.5',
+
+    # Diazo
+    'diazo==1.0.5',
+
+    # Dpaste
+    'dpaste==2.8',
+
+    # Mailman 2 REST API
+    'mailman-api==0.2.9',
+]
+
+TEST_REQUIREMENTS = [
+    'Whoosh==2.5.7',
+    'coverage==3.7.1',
+    'coveralls==0.5',
+    'flake8==2.3.0',
+]
 
 
 EXCLUDE_FROM_PACKAGES = []
@@ -25,7 +83,8 @@ setup(
     ]},
     zip_safe=False,
     long_description=open('README.rst').read(),
-    install_requires=reqs,
+    install_requires=REQUIREMENTS,
+    tests_require=TEST_REQUIREMENTS,
     test_suite="tests.run.run_with_coverage",
     classifiers=[
         'Development Status :: 3 - Alpha',
diff --git a/vagrant/provision.sh b/vagrant/provision.sh
index e668ac0..240a8c0 100755
--- a/vagrant/provision.sh
+++ b/vagrant/provision.sh
@@ -24,7 +24,6 @@ for dir in /vagrant/colab /vagrant; do
         break
     fi
 done
-pip install -r $basedir/requirements_dev.txt
 pip install -e $basedir
 
 if [ ! -s /etc/colab/settings.yaml ]; then
--
libgit2 0.21.2