summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-05 09:56:37 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-03-05 09:56:37 -0800
commitbd61c7c0a9a4a2020d0acfb6a01e9ec85bb43b8e (patch)
treed42e4d391262564b3a1fa8366da17b9a28622aef
parent7a776b1757e65611460065adc8fc784b1a9525b4 (diff)
parente694fa243cf73d892e412ccd05dc5b1bed216d49 (diff)
Merge branch '1.12'
-rw-r--r--README5
-rw-r--r--dev-requirements.txt1
2 files changed, 1 insertions, 5 deletions
diff --git a/README b/README
index 09334675..537956e8 100644
--- a/README
+++ b/README
@@ -124,10 +124,7 @@ Use
---
the demo scripts are probably the best example of how to use this package.
-there is also a lot of documentation, generated with epydoc, in the doc/
-folder. point your browser there. seriously, do it. mad props to
-epydoc, which actually motivated me to write more documentation than i
-ever would have before.
+there is also a lot of documentation, generated with Sphinx autodoc, in the doc/ folder.
there are also unit tests here::
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 88d94b72..e4dd942d 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,6 +1,5 @@
# Older junk
tox>=1.4,<1.5
-epydoc>=3.0,<3.1
# For newer tasks like building Sphinx docs.
# NOTE: Requires Python >=2.6
invoke>=0.7.0