Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-295-makefile-deploy-target-is-broken 56443b2c1 -> 4ff4012d2 (forced update)
ARIA-295 Makefile fixes - Fixed the "clean" target which would sometimes raise errors. Also, it will no longer delete the *.egg-info directory, which is needed for editable mode installations. - Removed the "deploy" target which was broken, and should probably not be a part of the Makefile at this stage. Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/4ff4012d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/4ff4012d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/4ff4012d Branch: refs/heads/ARIA-295-makefile-deploy-target-is-broken Commit: 4ff4012d28f0255ad0a46cc4b960f8e4fa3f0cd7 Parents: 53dc64e Author: Ran Ziv <[email protected]> Authored: Thu Jun 29 13:42:01 2017 +0300 Committer: Ran Ziv <[email protected]> Committed: Thu Jun 29 13:55:56 2017 +0300 ---------------------------------------------------------------------- Makefile | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/4ff4012d/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 4884a65..50675bf 100644 --- a/Makefile +++ b/Makefile @@ -24,13 +24,13 @@ PYTHON_VERSION = $$(python -V 2>&1 | cut -f2 -d' ' | cut -f1,2 -d'.' --output-de .PHONY: clean install install-virtual docs test dist deploy default: - @echo "Please choose one of the following targets: clean, install, install-virtual, docs, test, dist, deploy, requirements.txt" + @echo "Please choose one of the following targets: clean, install, install-virtual, docs, test, dist, requirements.txt" clean: rm -rf "$(DIST)" "$(HTML)" .tox .coverage* - -find . -type f -name '.coverage' -delete - -find . -type d -name '.coverage' -exec rm -rf {} \; 2>/dev/null - -find . -type d -name '*.egg-info' -exec rm -rf {} \; 2>/dev/null + -find . -maxdepth 1 -type f -name '.coverage' -delete + -find . -maxdepth 1 -type d -name '.coverage' -exec rm -rf {} \; 2>/dev/null + -find . -maxdepth 1 -type d -name 'build' -exec rm -rf {} \; 2>/dev/null install: pip install .[ssh] @@ -51,22 +51,13 @@ docs: test: pip install --upgrade "tox>=2.7.0" - tox -e pylint_code - tox -e pylint_tests - tox -e py$(PYTHON_VERSION) - tox -e py$(PYTHON_VERSION)e2e - tox -e py$(PYTHON_VERSION)ssh + tox -e pylint_code -e pylint_tests -e py$(PYTHON_VERSION) -e py$(PYTHON_VERSION)e2e -e py$(PYTHON_VERSION)ssh dist: docs python ./setup.py sdist bdist_wheel # pushing LICENSE and additional files into the binary distribution archive -find "$(DIST)" -type f -name '*.whl' -exec zip -u {} LICENSE NOTICE DISCLAIMER \; -deploy: - pip install --upgrade "twine>=1.9.1" - gpg --detach-sign -a "$(DIST)"/* - twine upload "$(DIST)"/* - ./requirements.txt: ./requirements.in pip install --upgrade "pip-tools>=1.9.0" pip-compile --output-file ./requirements.txt ./requirements.in
