From f31f503e0917f50a0a3d71b34a023e3b04d643ca Mon Sep 17 00:00:00 2001 From: Christopher Swenson Date: Fri, 29 May 2015 13:15:48 -0700 Subject: [PATCH 1/2] pip freeze requirements.txt Some environments, like PyCharm, try to install `requirements.txt` before they consider `setup.py`. --- requirements.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4a9af73..e1f7be4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,5 @@ -Sphinx==1.3.1 -https://bitbucket.org/readthedocs/sphinx-autoapi/get/master.zip -https://github.com/snide/sphinx_rtd_theme/archive/master.zip +epydoc==3.0.1 +epyparse==0.2.5 +PyYAML==3.11 +sphinx-autoapi==0.1.1 +wheel==0.24.0 From 8ff10028ef296a07b0f52e38f35284d899178613 Mon Sep 17 00:00:00 2001 From: Christopher Swenson Date: Fri, 29 May 2015 13:30:05 -0700 Subject: [PATCH 2/2] Sphinx is required --- requirements.txt | 2 +- setup.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e1f7be4..7039a9a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ epydoc==3.0.1 epyparse==0.2.5 PyYAML==3.11 -sphinx-autoapi==0.1.1 wheel==0.24.0 +sphinx==1.3.1 diff --git a/setup.py b/setup.py index cb0a386..bc3b736 100644 --- a/setup.py +++ b/setup.py @@ -6,6 +6,7 @@ try: 'PyYAML', 'epyparse', 'epydoc', + 'sphinx', ], test_suite='nose.collector', tests_require=['nose', 'mock'], @@ -17,6 +18,7 @@ except ImportError: 'PyYAML', 'epyparse', 'epydoc', + 'sphinx' ], )