From 1787b29a6fb62a537492daf5fc0c80fba7c2cdba Mon Sep 17 00:00:00 2001 From: Kirill Klenov Date: Sun, 18 May 2014 11:40:10 +0700 Subject: [PATCH] Fix docs --- Makefile | 5 +++-- docs/conf.py | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b02d875..ac116bd 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,9 @@ upload: docs .PHONY: docs # target: docs - Compile and upload docs docs: - python setup.py build_sphinx --source-dir=docs/ --build-dir=docs/_build --all-files - python setup.py upload_sphinx --upload-dir=docs/_build/html + @pip install sphinx sphinx-pypi-upload + @python setup.py build_sphinx --source-dir=docs/ --build-dir=docs/_build --all-files + @python setup.py upload_sphinx --upload-dir=docs/_build/html .PHONY: t # target: t - Runs tests diff --git a/docs/conf.py b/docs/conf.py index cc15792..91a92fb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -15,7 +15,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from django_markdown import VERSION, AUTHOR +from django_markdown import __version__, __author__ # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -45,16 +45,16 @@ # General information about the project. project = u'django-markdown' -copyright = AUTHOR +copyright = __author__ # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -VERSION = VERSION +VERSION = __version__ # The full version, including alpha/beta/rc tags. -release = VERSION +release = __version__ # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.