organized requirements

.landscape.yaml

@@ -25,7 +25,7 @@ ignore-paths:
     - .openshift
 
 requirements:
-    - requirements.txt
-    - requirements_test.txt
+    - requirements/requirements.txt
+    - requirements/test.txt
 
 #max-line-length: 120

.openshift/action_hooks/deploy

@@ -15,7 +15,7 @@ cd $OPENSHIFT_REPO_DIR
 export PYTHONPATH=$PWD
 
 echo "installing requirements"
-pip install -r requirements.txt --upgrade
+pip install -r requirements/requirements.txt --upgrade
 
 echo "installing test requirements"
-pip install -r requirements_dev.txt --upgrade
+pip install -r requirements/dev.txt --upgrade

.travis.yml

@@ -4,8 +4,8 @@ python:
   - "3.4"
 services: mongodb
 install:
-  - "pip install --upgrade -r requirements.txt"
-  - "pip install --upgrade -r requirements_test.txt"
+  - "pip install --upgrade -r requirements/requirements.txt"
+  - "pip install --upgrade -r requirements/test.txt"
 script: make test
 after_success:
   - coveralls

CONTRIBUTING.md

@@ -68,8 +68,8 @@ for local development.
 
         $ mkvirtualenv quokkadev
         $ cd quokka/
-        $ pip install -r requirements.txt
-        $ pip install -r requirements_test.txt
+        $ pip install -r requirements/requirements.txt
+        $ pip install -r requirements/test.txt
 
  > Make sure you have MongoDB installed locally or in an accessible server
 

Dockerfile

@@ -1,13 +1,13 @@
 FROM alpine
 MAINTAINER Bruno Rocha <rochacbruno@gmail.com>
 WORKDIR /tmp
-COPY requirements.txt /tmp/
-COPY requirements_test.txt /tmp/
-COPY requirements_dev.txt /tmp/
+COPY requirements/requirements.txt /tmp/
+COPY requirements/test.txt /tmp/
+COPY requirements/dev.txt /tmp/
 RUN apk update
 RUN apk add gcc python py-pip libjpeg zlib zlib-dev tiff freetype git py-pillow python-dev musl-dev bash
 RUN pip install -r /tmp/requirements.txt
-RUN pip install -r /tmp/requirements_test.txt
-RUN pip install -r /tmp/requirements_dev.txt
+RUN pip install -r /tmp/test.txt
+RUN pip install -r /tmp/dev.txt
 
 # docker run --link <mongo_container_id>:mongo -v $PWD:/quokka -t -i quokka/quokkadev /bin/bash

README.md

@@ -121,7 +121,7 @@ Install all needed python packages
 > activate your virtualenv if you want
 
 ```bash
-pip install -r requirements.txt
+pip install -r requirements/requirements.txt
 ```
 
 #### Create admin user, sample data and run!

etc/scripts/setup-quokka-nginx-uwsgi-opensuse.sh

@@ -27,7 +27,7 @@ echo "$SERVER_IP  $SERVER_FQDN" >>/etc/hosts
 
 zypper ar http://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_${SUSE_VERSION}/ devel_python
 zypper --no-gpg-checks refresh
-zypper in -y gcc make mongodb git-core sudo nginx python-devel libjpeg8-devel 
+zypper in -y gcc make mongodb git-core sudo nginx python-devel libjpeg8-devel
 zypper in -y python-pip python-virtualenv pcre-devel python-imaging
 
 ## Start MongoDB
@@ -48,7 +48,7 @@ cd quokka-env
 git clone https://github.com/quokkaproject/quokka
 cd quokka
 
-/home/quokka/quokka-env/bin/pip install -r requirements.txt
+/home/quokka/quokka-env/bin/pip install -r requirements/requirements.txt
 chown -R quokka:quokka /home/quokka
 
 
@@ -76,7 +76,7 @@ echo 'server {
 		 client_body_buffer_size 32K;
 		 client_max_body_size 20M;
 		 sendfile on;
-         send_timeout 300s; 
+         send_timeout 300s;
 
         location ~ ^/(static|mediafiles)/ {
             root    /home/quokka/quokka-env/quokka/quokka;

etc/scripts/setup-quokka-nginx-uwsgi-ubuntu.sh

@@ -47,7 +47,7 @@ cd quokka-env
 git clone https://github.com/quokkaproject/quokka
 
 cd quokka
-/home/quokka/quokka-env/bin/pip install -r requirements.txt
+/home/quokka/quokka-env/bin/pip install -r requirements/requirements.txt
 
 
 ## Populating with sample data
@@ -62,7 +62,7 @@ pip install --upgrade uwsgi
 # Prepare folders for uwsgi
 mkdir -p /etc/uwsgi && mkdir -p /var/log/uwsgi
 
- 
+
 echo 'server {
         listen          YOUR_SERVER_IP:80;
         server_name     YOUR_SERVER_FQDN;
@@ -72,7 +72,7 @@ echo 'server {
 		 client_body_buffer_size 32K;
 		 client_max_body_size 20M;
 		 sendfile on;
-         send_timeout 300s; 
+         send_timeout 300s;
 
         location ~ ^/(static|mediafiles)/ {
             root    /home/quokka/quokka-env/quokka/quokka;

wercker.yml

@@ -9,11 +9,11 @@ build:
     - script:
         name: install main requirements
         code: |
-          pip install -r requirements.txt
+          pip install -r requirements/requirements.txt
     - script:
         name: install test requirements
         code: |
-          pip install -r requirements_test.txt
+          pip install -r requirements/test.txt
     - script:
         name: Run Tests
         code: |