Add extra 'clean' rules to Makefile, and get 'make docs' working (#299)

Author: lurch

Makefile

@@ -1,10 +1,20 @@
 
 .PHONY: release
-release:
-	rm dist/*.whl dist/*.tar.gz
+release: cleandist
 	python3 setup.py sdist bdist_wheel
 	twine upload dist/*.whl dist/*.tar.gz
 
+.PHONY: cleandist
+cleandist:
+	rm -f dist/*.whl dist/*.tar.gz
+
+.PHONY: cleandocs
+cleandocs:
+	$(MAKE) -C docs clean
+
+.PHONY: clean
+clean: cleandist cleandocs
+
 .PHONY: test
 test:
 	nosetests --with-coverage --cover-package=fs -a "!slow" tests
@@ -19,7 +29,7 @@ testall:
 
 .PHONY: docs
 docs:
-	cd docs && make html
+	$(MAKE) -C docs html
 	python -c "import os, webbrowser; webbrowser.open('file://' + os.path.abspath('./docs/build/html/index.html'))"
 
 .PHONY: typecheck

docs/source/conf.py

@@ -14,7 +14,6 @@
 
 import sys
 import os
-from fs import __version__
 
 
 import sphinx_rtd_theme
@@ -26,7 +25,7 @@
 # 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
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../..'))
 
 # -- General configuration ------------------------------------------------
 
@@ -71,6 +70,7 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
+from fs import __version__
 # The short X.Y version.
 version = '.'.join(__version__.split('.')[:2])
 # The full version, including alpha/beta/rc tags.
@@ -303,4 +303,4 @@
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
 
-napoleon_include_special_with_doc = True
+napoleon_include_special_with_doc = True