Expand integration tests to use stable/edge versions of juju (#155)

[osm/N2VC.git] / Makefile

diff --git a/Makefile b/Makefile
index c474175..2e59306 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,13 @@ BIN := .tox/py35/bin
 PY := $(BIN)/python3.5
 PIP := $(BIN)/pip
 SCHEMAGEN := $(shell which schemagen)
+VERSION=$(shell cat VERSION)
 
 clean:
        find . -name __pycache__ -type d -exec rm -r {} +
        find . -name *.pyc -delete
        rm -rf .tox
+       rm -rf docs/_build/
 
 .tox:
        tox -r --notest
@@ -22,17 +24,15 @@ test:
 
 docs: .tox
        $(PIP) install -r docs/requirements.txt
-       rm -rf docs/api/* docs/_build/
-       $(BIN)/sphinx-apidoc -o docs/api/ juju/
+       rm -rf docs/_build/
        $(BIN)/sphinx-build -b html docs/  docs/_build/
        cd docs/_build/ && zip -r docs.zip *
 
-release: docs
+release:
        git remote | xargs -L1 git fetch --tags
        $(PY) setup.py sdist upload
        git tag ${VERSION}
        git remote | xargs -L1 git push --tags
-       @echo "Please manually upload docs/_build/docs.zip via the PyPI website"
 
 upload: release