Skip to content

Commit

Permalink
Added top-level requirements file
Browse files Browse the repository at this point in the history
  • Loading branch information
syndbg authored and ericholscher committed Apr 15, 2015
1 parent 7e88974 commit 103deef
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@ language: python
python:
- "2.7"
install:
<<<<<<< HEAD
- pip install flake8 stripe
- pip install --allow-all-external --allow-unverified bzr --allow-unverified launchpadlib --allow-unverified lazr.authentication -r requirements/pip.txt
=======
- pip install flake8
- pip install --allow-all-external --allow-unverified bzr --allow-unverified launchpadlib --allow-unverified lazr.authentication -r requirements.txt
>>>>>>> Added top-level requirements file
- pip install coveralls
script:
#- flake8 `find . -iname "*.py" -not -ipath "*migration*"`
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ include README.rst
include CHANGES
include LICENSE.mit
include MANIFEST.in
include requirements.txt
recursive-include requirements *.txt
recursive-include docs *
recursive-include readthedocs *
Expand Down
6 changes: 3 additions & 3 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 requirements/pip.txt
pip install -r requirements.txt

.. note::

Expand All @@ -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 requirements/pip.txt
pip install -r requirements.txt

.. note::

Linux users may find they need to install a few additional packages
in order to successfully execute ``pip-install -r requirements/pip.txt``.
in order to successfully execute ``pip-install -r requirements.txt``.
For example, a clean install of Ubuntu 14.04 LTS will require the
following packages::

Expand Down
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-r requirements/pip.txt
# just referencing for a natural `pip install -r requirements.txt`

0 comments on commit 103deef

Please sign in to comment.