Organized requirements.

Author: syndbg

.travis.yml

@@ -3,7 +3,7 @@ python:
  - "2.7"
 install:
  - pip install flake8 stripe
- - pip install --allow-all-external --allow-unverified bzr --allow-unverified launchpadlib --allow-unverified lazr.authentication -r pip_requirements.txt
+ - pip install --allow-all-external --allow-unverified bzr --allow-unverified launchpadlib --allow-unverified lazr.authentication -r requirements/pip.txt
  - pip install coveralls
 script:
  #- flake8 `find . -iname "*.py" -not -ipath "*migration*"`

MANIFEST.in

@@ -4,7 +4,7 @@ include README.rst
 include CHANGES
 include LICENSE.mit
 include MANIFEST.in
-include pip_requirements.txt
+recursive-include requirements *.txt
 recursive-include docs *
 recursive-include readthedocs *
 recursive-exclude readthedocs *.pyc

deploy/flask-redirects.py

@@ -50,4 +50,4 @@ def redirect_front():
 
 
 if __name__ == '__main__':
-    app.run()
+    app.run()

deploy/nginx-smoke-test.py

@@ -26,6 +26,7 @@ def served_by_django(url):
     django = ('x-served' not in r.headers or r.headers['x-served'] == 'nginx-via-django')
     return all([status, django])
 
+
 def served_by_perl(url):
     """Return True if url returns 200 and is served by Perl."""
     r = requests.get(url, allow_redirects=False)

docs/install.rst

@@ -3,7 +3,7 @@
 Installation
 =============
 
-Here is a step by step plan on how to install Read the Docs. 
+Here is a step by step plan on how to install Read the Docs.
 It will get you to a point of having a local running instance.
 
 First, obtain Python_ and virtualenv_ if you do not already have them. Using a
@@ -41,7 +41,7 @@ Create a folder in here, and clone the repository::
 Next, install the dependencies using ``pip`` (included with virtualenv_)::
 
     cd readthedocs.org
-    pip install -r pip_requirements.txt
+    pip install -r requirements/pip.txt
 
 .. note::
 
@@ -51,12 +51,12 @@ Next, install the dependencies using ``pip`` (included with virtualenv_)::
 
         CFLAGS=-I/usr/local/opt/libxml2/include/libxml2 \
         LDFLAGS=-L/usr/local/opt/libxml2/lib \
-        pip install -r pip_requirements.txt
+        pip install -r requirements/pip.txt
 
 .. note::
 
     Linux users may find they need to install a few additional packages
-    in order to successfully execute ``pip-install -r pip_requirements.txt``.
+    in order to successfully execute ``pip-install -r requirements/pip.txt``.
     For example, a clean install of Ubuntu 14.04 LTS will require the
     following packages::
 

fabfile-development.py

@@ -31,7 +31,7 @@ def pip_requirements():
     """Install pip requirements"""
     with cd(env.code_dir):
         with prefix("source %s/bin/activate" % (env.virtualenv)):
-            run("pip install -r pip_requirements.txt")
+            run("pip install -r requirements/pip.txt")
 
 
 def build_db():

deploy_requirements.txt requirements/deploy.txt

@@ -1,4 +1,4 @@
--r pip_requirements.txt
+-r pip.txt
 psycopg2==2.4
 gunicorn==19.1.0
 pysolr==2.0.13

onebox_requirements.txt requirements/onebox.txt

@@ -1,4 +1,4 @@
--r pip_requirements.txt
+-r pip.txt
 dnspython
 gunicorn
 #For resizing images

pip_requirements.txt requirements/pip.txt

@@ -1,9 +1,9 @@
 # Hack around bzr hosting
 
 --allow-external bzr
---allow-unverified bzr 
+--allow-unverified bzr
 --allow-external launchpadlib
---allow-unverified launchpadlib 
+--allow-unverified launchpadlib
 --allow-external lazr.authentication
 --allow-unverified lazr.authentication