From 83df50f47426cefb71c2f4fde161c8fad934dba3 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Thu, 24 Oct 2019 14:02:36 +0100 Subject: [wip] First commit of new code structure Not fully functional yet probably --- Makefile | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 Makefile (limited to 'Makefile') diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ed2d040 --- /dev/null +++ b/Makefile @@ -0,0 +1,62 @@ +# Makefile for easier installation and cleanup. +# +# Uses self-documenting macros from here: +# http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html + +PACKAGE=paper2remarkable +DOC_DIR='./docs/' +VENV_DIR='/tmp/p2r_venv/' + +.PHONY: help cover dist + +.DEFAULT_GOAL := help + +help: + @grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) |\ + awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-15s\033[0m\ + %s\n", $$1, $$2}' + +release: ## Make a release + python make_release.py + + +install: ## Install for the current user using the default python command + python setup.py build_ext --inplace + python setup.py install --user + + +test: venv ## Run unit tests + source $(VENV_DIR)/bin/activate && green -v ./tests/test_unit + + +clean: ## Clean build dist and egg directories left after install + rm -rf ./dist + rm -rf ./build + rm -rf ./$(PACKAGE).egg-info + rm -rf $(VENV_DIR) + rm -f MANIFEST + find . -type f -iname '*.pyc' -delete + find . -type d -name '__pycache__' -empty -delete + +dist: ## Make Python source distribution + python setup.py sdist + python setup.py bdist_wheel --universal + +docs: doc +doc: install ## Build documentation with Sphinx + m2r README.md && mv README.rst $(DOC_DIR) + m2r CHANGELOG.md && mv CHANGELOG.rst $(DOC_DIR) + cd $(DOC_DIR) && \ + rm source/* && \ + sphinx-apidoc -H 'CleverCSV API Documentation' -o source ../$(PACKAGE) && \ + touch source/AUTOGENERATED + $(MAKE) -C $(DOC_DIR) html + + + +venv: $(VENV_DIR)/bin/activate + +$(VENV_DIR)/bin/activate: + test -d $(VENV_DIR) || virtualenv $(VENV_DIR) + source $(VENV_DIR)/bin/activate && pip install -q -e .[dev] + touch $(VENV_DIR)/bin/activate -- cgit v1.2.3 From db56f74e5430ac1f1a1b255db3dc3fe799bffbbb Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Thu, 24 Oct 2019 22:58:08 +0100 Subject: minor makefile fixes --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ed2d040..baccb92 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ PACKAGE=paper2remarkable DOC_DIR='./docs/' -VENV_DIR='/tmp/p2r_venv/' +VENV_DIR=/tmp/p2r_venv/ .PHONY: help cover dist @@ -26,7 +26,7 @@ install: ## Install for the current user using the default python command test: venv ## Run unit tests - source $(VENV_DIR)/bin/activate && green -v ./tests/test_unit + source $(VENV_DIR)/bin/activate && green -v ./tests clean: ## Clean build dist and egg directories left after install @@ -52,11 +52,9 @@ doc: install ## Build documentation with Sphinx touch source/AUTOGENERATED $(MAKE) -C $(DOC_DIR) html - - venv: $(VENV_DIR)/bin/activate $(VENV_DIR)/bin/activate: test -d $(VENV_DIR) || virtualenv $(VENV_DIR) - source $(VENV_DIR)/bin/activate && pip install -q -e .[dev] + source $(VENV_DIR)/bin/activate && pip install -e .[dev] touch $(VENV_DIR)/bin/activate -- cgit v1.2.3 From 395ab716bb5c8ed74a4f0b447ec8243f64515ea8 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Fri, 25 Oct 2019 00:03:48 +0100 Subject: makefile changes --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index baccb92..2a656d4 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ install: ## Install for the current user using the default python command test: venv ## Run unit tests - source $(VENV_DIR)/bin/activate && green -v ./tests + source $(VENV_DIR)/bin/activate && green -f -vv -a ./tests clean: ## Clean build dist and egg directories left after install -- cgit v1.2.3