Merge upstream libjuju
Merge upstream libjuju (bug fixes)
Change-Id: Ia28b8a0ea2168a4df74823e8493c650491afb695
Signed-off-by: Adam Israel <adam.israel@canonical.com>
diff --git a/modules/libjuju/Makefile b/modules/libjuju/Makefile
index bd59a97..38dcc11 100644
--- a/modules/libjuju/Makefile
+++ b/modules/libjuju/Makefile
@@ -13,7 +13,7 @@
.tox:
tox -r --notest
-client:
+client: .tox
ifndef SCHEMAGEN
$(error "schemagen is not available, please install from https://github.com/juju/schemagen")
endif
@@ -22,6 +22,10 @@
test:
tox
+.PHONY: lint
+lint:
+ tox -e lint --notest
+
docs: .tox
$(PIP) install -r docs/requirements.txt
rm -rf docs/_build/
@@ -30,7 +34,9 @@
release:
git fetch --tags
- $(PY) setup.py sdist upload
+ rm dist/*.tar.gz
+ $(PY) setup.py sdist
+ $(BIN)/twine upload --repository-url https://upload.pypi.org/legacy/ dist/*
git tag ${VERSION}
git push --tags