move requirements to install_requires

Author: thijstriemstra

.travis.yml

@@ -4,11 +4,7 @@ python:
   - "3.4"
 sudo: required
 cache: pip
-install:
-  - "pip install --upgrade pip"
-  - "pip install -r requirements/production.txt"
-  - "pip install -r requirements/testing.txt"
-  - "pip install ."
+install: pip install --upgrade pip tox coveralls
 before_script:
   - wget -q http://johnvansickle.com/ffmpeg/builds/ffmpeg-git-64bit-static.tar.xz
   - tar -xf ffmpeg-*.tar.xz -v

MANIFEST.in

@@ -1,6 +1,6 @@
 include README.rst LICENSE tox.ini .coveragerc runtests.py
 
-recursive-include requirements *
+recursive-include encode/tests *.txt
 recursive-include encode/locale *
 recursive-include encode/static *
 

README.rst

@@ -12,6 +12,7 @@ django-encode
 .. image:: https://img.shields.io/badge/license-MIT-blue.svg
     :target: https://raw.githubusercontent.com/collab-project/django-encode/master/LICENSE
 
+
 Installation
 ------------
 
@@ -22,6 +23,13 @@ Use pip_ to install the download and install the package from PyPi_::
 Or checkout the source code from Github_::
 
   git clone https://github.com/collab-project/django-encode.git
+  cd django-encode
+  pip install -e .
+
+The dependency ``python-video-converter`` is not available on PyPi and needs to be installed
+manually::
+
+  pip install -e git+https://github.com/thijstriemstra/python-video-converter.git#egg=python-video-converter
 
 
 Documentation

doc/development.rst

@@ -3,10 +3,9 @@ Development
 
 After checkout, install dependencies and package in active virtualenv::
 
-  $ pip install -r requirements/development.txt
-  $ pip install -r requirements/testing.txt
-  $ pip install -r requirements/production.txt
+  $ pip -e git+https://github.com/thijstriemstra/python-video-converter.git#egg=python-video-converter
   $ pip install -e .
+  $ pip install -r encode/tests/requirements.txt
 
 
 Testing
@@ -24,7 +23,7 @@ Running tests without Tox_::
 
   $ ./runtests.py
 
-Directly with `django-admin`::
+Directly with ``django-admin``::
 
   $ django-admin test --settings=encode.tests.settings encode
 
@@ -53,5 +52,19 @@ version `django.mo`::
   $ django-admin compilemessages --settings=encode.tests.settings
 
 
+Documentation
+-------------
+
+Install Sphinx::
+
+  $ pip install sphinx>=1.1.0
+
+Change to the ``doc`` directory and run::
+
+  $ make html
+
+The resulting HTML output can be found in the ``doc/_build/html`` directory.
+
+
 .. _Tox: http://tox.testrun.org/
 .. _coverage.py: http://nedbatchelder.com/code/coverage/

requirements/testing.txt renamed to encode/tests/requirements.txt

@@ -58,5 +58,10 @@ def run_tests(self):
     author='Collab',
     author_email='[email protected]',
     url='http://github.com/collab-project/django-encode',
-    license='MIT'
+    license='MIT',
+    install_requires=[
+        'celery>=3.1',
+        'django-appconf>=0.6',
+        'django-queued-storage>=0.8.0'
+    ]
 )

requirements/development.txt

@@ -10,8 +10,9 @@ envlist = py27,py34
 skipsdist = False
 
 [base]
-deps = -r{toxinidir}/requirements/production.txt
-       -r{toxinidir}/requirements/testing.txt
+deps = Django
+       -egit+https://github.com/thijstriemstra/python-video-converter.git#egg=python-video-converter
+       -r{toxinidir}/encode/tests/requirements.txt
 
 
 [testenv]