Skip to content

Commit

Permalink
Merge pull request deis#2226 from mboersma/fix-docs-reqs
Browse files Browse the repository at this point in the history
fix(docs): update requirements in sync with controller
  • Loading branch information
mboersma committed Oct 22, 2014
2 parents 459a06c + 3894f81 commit 8db48dd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
7 changes: 1 addition & 6 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ Please add any issues you find with this documentation to the
```console
$ virtualenv venv -q --prompt='(docs)' && . venv/bin/activate
(docs)$ pip install -r docs_requirements.txt
Downloading/unpacking celery==3.1.8
...
Successfully installed psycopg2 python-etcd PyYAML ...
Cleaning up...
(docs)$
```

See comments at the top of the ``docs_requirements.txt`` file if you
Expand All @@ -32,7 +27,7 @@ Please add any issues you find with this documentation to the
(docs)$ make server
sphinx-build -b dirhtml -d _build/doctrees . _build/dirhtml
Making output directory...
Running Sphinx v1.2.2
Running Sphinx v1.2.3
...
Build finished. The HTML pages are in _build/dirhtml.
Serving HTTP on 0.0.0.0 port 8000 ...
Expand Down
5 changes: 2 additions & 3 deletions docs/docs_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
# NOTE: For testing on Mac OS X Mavericks, use the following to work around a clang issue:
# ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]
#
celery==3.1.13
Django==1.6.7
# FIXME: switch to upstream pending merge of https://github.com/kmmbvnr/django-fsm/pull/59
git+https://github.com/deis/django-fsm@propagate-false
django-guardian==1.2.4
django-json-field==0.5.7
djangorestframework==2.3.14
docker-py==0.4.0
gunicorn==18.0
gunicorn==19.1.1
paramiko==1.14.1
psycopg2==2.5.4
python-etcd==0.3.0
Expand All @@ -28,6 +27,6 @@ requests==2.3.0
termcolor==1.1.0

# Deis documentation requirements
Sphinx>=1.2.2
Sphinx>=1.2.3
smartypants>=1.8.6
sphinxcontrib-httpdomain>=1.3.0

0 comments on commit 8db48dd

Please sign in to comment.