v1.2.1: dependency fixes

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · May 20, 2015 · e6da7353817f45643a117d34149300c9f86ba9aa · e6da735
1 parent 6fa8673
commit e6da7353817f45643a117d34149300c9f86ba9aa
Unified Split

Showing with 10 additions and 4 deletions.

+5 −0 CHANGELOG.rst

+2 −1 docs/admin/setup.rst

+1 −1 requirements.txt

+2 −2 setup.py
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Appendix A. Changelog
 =====================
 
+v1.2.1
+------
+
+* Specify deps in ``setup.py``
+
 v1.2.0
 ------
 

diff --git a/docs/admin/setup.rst b/docs/admin/setup.rst
@@ -19,14 +19,15 @@ use an existing site.
 Virtualenv
 ==========
 
-Create a virtualenv in ``/var/coil`` and install Coil, Nikola and uWSGI in it.
+Create a virtualenv in ``/var/coil`` and install Coil, Nikola, uWSGI and rq in it.
 
 .. code-block:: console
 
     # virtualenv-2.7 /var/coil
     # cd /var/coil
     # source bin/activate
     # pip install nikola coil uwsgi
+    # pip install 'git+https://github.com/nvie/rq.git#egg=rq'
 
 Nikola and ``conf.py``
 ======================

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-Nikola>=7.4.1
 git+https://github.com/nvie/rq.git#egg=rq
+Nikola>=7.4.1
 blinker==1.3
 docopt==0.6.2
 docutils==0.12

diff --git a/setup.py b/setup.py
@@ -4,10 +4,10 @@
 from setuptools import setup
 
 with open('requirements.txt', 'r') as fh:
-    dependencies = [l.strip() for l in fh][2:]
+    dependencies = [l.strip() for l in fh][1:]
 
 setup(name='coil',
-      version='1.2.0',
+      version='1.2.1',
       description='A user-friendly CMS frontend for Nikola.',
       keywords='coil,nikola,cms',
       author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',