Skip to content

Commit 943c131

Browse files
committed
Merge pull request #2290 from mboersma/docs-make-zipfile
fix(docs): restore "make zipfile" target for pypi docs
2 parents ebf59a8 + 4dd596c commit 943c131

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

controller/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
Django==1.6.8
77
# FIXME: switch to upstream pending merge of https://github.com/kmmbvnr/django-fsm/pull/59
88
git+https://github.com/deis/django-fsm@propagate-false
9+
django-cors-headers==0.13
910
django-guardian==1.2.4
1011
django-json-field==0.5.7
1112
djangorestframework==2.4.3
@@ -18,4 +19,3 @@ PyYAML==3.11
1819
redis==2.9.1
1920
static==1.0.2
2021
South==1.0
21-
django-cors-headers==0.13

docs/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ test: clean
7575
@echo
7676
@echo "Test finished. The HTML pages are in $(BUILDDIR)/dirhtml."
7777

78+
zipfile: dirhtml
79+
cd $(BUILDDIR)/dirhtml; zip -r -D -o ../../docs.zip .
80+
7881
singlehtml:
7982
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
8083
@echo

docs/docs_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
Django==1.6.8
1111
# FIXME: switch to upstream pending merge of https://github.com/kmmbvnr/django-fsm/pull/59
1212
git+https://github.com/deis/django-fsm@propagate-false
13+
django-cors-headers==0.13
1314
django-guardian==1.2.4
1415
django-json-field==0.5.7
1516
djangorestframework==2.4.3
@@ -19,7 +20,6 @@ paramiko==1.14.1
1920
psycopg2==2.5.4
2021
python-etcd==0.3.0
2122
South==1.0
22-
django-cors-headers==0.13
2323

2424
# Deis client requirements
2525
docopt==0.6.2

0 commit comments

Comments
 (0)