Merge lp:~michael.nelson/ubuntu-webcatalog/update-requirements into lp:ubuntu-webcatalog

[Michael Nelson]

Move package requirements into setup.py and rename requirements.txt -> test_requirements.txt

Overview
========

This branch just splits out the requirements so that those required to install the package are included in the setup.py, while the remaining test requirements stay in the renamed requirements file.

To test: `fab bootstrap && fab test`

Note: I had one issue, documented in the test_requirements.txt file.
Note: I'm just doing this so I can `python setup.py install` the app.

[Łukasz Czyżykowski (lukasz-czyzykowski)]

All looks good

review: Approve

=== modified file 'fabtasks/bootstrap.py'
--- fabtasks/bootstrap.py	2011-09-12 13:37:24 +0000
+++ fabtasks/bootstrap.py	2011-11-17 12:03:25 +0000
@@ -28,7 +28,7 @@
 
 
 def install_requirements():
-    local("virtualenv/bin/pip install -r requirements.txt", capture=False)
+    local("virtualenv/bin/pip install -r test_requirements.txt", capture=False)
     local("virtualenv/bin/python setup.py develop", capture=False)
     symlink_python_apt()
     symlink_gtk2()

=== modified file 'setup.py'
--- setup.py	2011-06-20 21:47:45 +0000
+++ setup.py	2011-11-17 12:03:25 +0000
@@ -33,10 +33,26 @@
     packages = find_packages('src'),
     package_dir = {'': 'src'},
     install_requires = [
+        'django',
         'setuptools',
-        'django',
         'south',
+        'configglue==0.10',
+        'django-configglue==0.4',
+        'django-openid-auth==0.2',
+        'django-piston',
+        'django-preflight',
+        'python-debian',
+        'python-openid',
+        'oauth',
+        'httplib2',
+        'django-pgtools==0.1',
+        'PIL',
+        'lazr.restfulclient',
         ],
     package_data = find_packages_data('src'),
+    dependency_links = [
+        'http://launchpad.net/django-pgtools/trunk/0.1/+download/django-pgtools-0.1.tar.gz#egg=django-pgtools-0.1',
+    ],
+
 )
 

=== renamed file 'requirements.txt' => 'test_requirements.txt'
--- requirements.txt	2011-07-19 15:44:09 +0000
+++ test_requirements.txt	2011-11-17 12:03:25 +0000
@@ -1,18 +1,8 @@
-configglue==0.10
+# django should not be required here, but without it `python setup.py develop`
+# complains with:
+# Installed /.../virtualenv/lib/python2.6/site-packages/django_preflight-0.1-py2.6.egg
+# error: Could not find required distribution django
+django
 coverage
-django
-django-configglue==0.4
-django-openid-auth==0.2
-django-piston
--e bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk
-django-preflight
 mock
-PIL
 piston-mini-client
-python-debian
-python-openid
-setuptools
-south
-oauth
-httplib2
-lazr.restfulclient