Skip to content

Commit

Permalink
Moved .done files into done directory
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>
  • Loading branch information
andy-maier committed Nov 26, 2023
1 parent 283f2d3 commit b11790f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 20 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/try/
.ipynb_checkpoints/
/*.done
/done/*.done
/packaging/*/*.tar.gz
/packaging/*/*.done
*.pyc
Expand Down
43 changes: 23 additions & 20 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ dist_included_files := \
setup.py \
$(package_name)/*.py \

# Directory for .done files
done_dir := done

.PHONY: help
help:
@echo "Makefile for $(project_name) project"
Expand Down Expand Up @@ -333,7 +336,7 @@ _check_installed:
$(PYTHON_CMD) -c "import $(package_name)"
@echo "Makefile: Done verifying installation of package $(package_name)"

pip_upgrade_$(pymn).done: Makefile
$(done_dir)/pip_upgrade_$(pymn)_$(PACKAGE_LEVEL).done: Makefile
@echo "Makefile: Installing/upgrading Pip (with PACKAGE_LEVEL=$(PACKAGE_LEVEL))"
-$(call RM_FUNC,$@)
bash -c 'pv=$$($(PIP_CMD) --version); if [[ $$pv =~ (^pip [1-8]\..*) ]]; then $(PYTHON_CMD) -m pip $(pip_opts) install pip==9.0.1; fi'
Expand All @@ -344,29 +347,29 @@ endif
echo "done" >$@
@echo "Makefile: Done installing/upgrading Pip"

install_basic_$(pymn).done: Makefile pip_upgrade_$(pymn).done
$(done_dir)/install_basic_$(pymn)_$(PACKAGE_LEVEL).done: Makefile $(done_dir)/pip_upgrade_$(pymn)_$(PACKAGE_LEVEL).done
@echo "Makefile: Installing/upgrading basic Python packages (with PACKAGE_LEVEL=$(PACKAGE_LEVEL))"
-$(call RM_FUNC,$@)
$(PIP_CMD_MOD) $(pip_opts) install $(pip_level_opts) setuptools wheel
echo "done" >$@
@echo "Makefile: Done installing/upgrading basic Python packages"

install_reqs_$(pymn).done: Makefile install_basic_$(pymn).done requirements.txt
$(done_dir)/install_reqs_$(pymn)_$(PACKAGE_LEVEL).done: Makefile $(done_dir)/install_basic_$(pymn)_$(PACKAGE_LEVEL).done requirements.txt
@echo "Makefile: Installing Python installation prerequisites (with PACKAGE_LEVEL=$(PACKAGE_LEVEL))"
-$(call RM_FUNC,$@)
$(PIP_CMD_MOD) $(pip_opts) install $(pip_level_opts) -r requirements.txt
echo "done" >$@
@echo "Makefile: Done installing Python installation prerequisites"

develop_reqs_$(pymn).done: install_basic_$(pymn).done dev-requirements.txt test-requirements.txt
$(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/install_basic_$(pymn)_$(PACKAGE_LEVEL).done dev-requirements.txt test-requirements.txt
@echo "Makefile: Installing development requirements (with PACKAGE_LEVEL=$(PACKAGE_LEVEL))"
-$(call RM_FUNC,$@)
$(PIP_CMD_MOD) $(pip_opts) install $(pip_level_opts) -r dev-requirements.txt
echo "done" >$@
@echo "Makefile: Done installing development requirements"

.PHONY: install
install: Makefile install_reqs_$(pymn).done setup.py
install: Makefile $(done_dir)/install_reqs_$(pymn)_$(PACKAGE_LEVEL).done setup.py
ifdef TEST_INSTALLED
@echo "Makefile: Skipping installation of package $(package_name) as standalone because TEST_INSTALLED is set"
@echo "Makefile: Checking whether package $(package_name) is actually installed:"
Expand All @@ -387,7 +390,7 @@ endif
@echo "Makefile: Target $@ done."

.PHONY: develop
develop: Makefile install_reqs_$(pymn).done develop_reqs_$(pymn).done setup.py
develop: Makefile $(done_dir)/install_reqs_$(pymn)_$(PACKAGE_LEVEL).done $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done setup.py
ifdef TEST_INSTALLED
@echo "Makefile: Skipping installation of package $(package_name) as editable because TEST_INSTALLED is set"
@echo "Makefile: Checking whether package $(package_name) is actually installed:"
Expand Down Expand Up @@ -416,19 +419,19 @@ builddoc: html
@echo "Makefile: Target $@ done."

.PHONY: check
check: flake8_$(pymn).done
check: $(done_dir)/flake8_$(pymn)_$(PACKAGE_LEVEL).done
@echo "Makefile: Target $@ done."

.PHONY: safety
safety: safety_$(pymn).done
safety: $(done_dir)/safety_$(pymn)_$(PACKAGE_LEVEL).done
@echo "Makefile: Target $@ done."

.PHONY: pylint
pylint: pylint_$(pymn).done
pylint: $(done_dir)/pylint_$(pymn)_$(PACKAGE_LEVEL).done
@echo "Makefile: Target $@ done."

.PHONY: mypy
mypy: mypy_$(pymn).done
mypy: $(done_dir)/mypy_$(pymn)_$(PACKAGE_LEVEL).done
@echo "Makefile: Target $@ done."

.PHONY: all
Expand Down Expand Up @@ -465,7 +468,7 @@ upload: _check_version $(dist_files)
@echo "Makefile: Target $@ done."

.PHONY: html
html: develop_reqs_$(pymn).done $(doc_build_dir)/html/docs/index.html
html: $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done $(doc_build_dir)/html/docs/index.html
@echo "Makefile: Target $@ done."

$(doc_build_dir)/html/docs/index.html: Makefile $(doc_dependent_files)
Expand All @@ -475,7 +478,7 @@ $(doc_build_dir)/html/docs/index.html: Makefile $(doc_dependent_files)
@echo "Makefile: Done creating the documentation as HTML pages; top level file: $@"

.PHONY: pdf
pdf: develop_reqs_$(pymn).done Makefile $(doc_dependent_files)
pdf: $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done Makefile $(doc_dependent_files)
@echo "Makefile: Creating the documentation as PDF file"
-$(call RM_FUNC,$@)
$(doc_cmd) -b latex $(doc_opts) $(doc_build_dir)/pdf
Expand All @@ -485,31 +488,31 @@ pdf: develop_reqs_$(pymn).done Makefile $(doc_dependent_files)
@echo "Makefile: Target $@ done."

.PHONY: man
man: develop_reqs_$(pymn).done Makefile $(doc_dependent_files)
man: $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done Makefile $(doc_dependent_files)
@echo "Makefile: Creating the documentation as man pages"
-$(call RM_FUNC,$@)
$(doc_cmd) -b man $(doc_opts) $(doc_build_dir)/man
@echo "Makefile: Done creating the documentation as man pages in: $(doc_build_dir)/man/"
@echo "Makefile: Target $@ done."

.PHONY: docchanges
docchanges: develop_reqs_$(pymn).done
docchanges: $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done
@echo "Makefile: Creating the doc changes overview file"
$(doc_cmd) -b changes $(doc_opts) $(doc_build_dir)/changes
@echo
@echo "Makefile: Done creating the doc changes overview file in: $(doc_build_dir)/changes/"
@echo "Makefile: Target $@ done."

.PHONY: doclinkcheck
doclinkcheck: develop_reqs_$(pymn).done
doclinkcheck: $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done
@echo "Makefile: Creating the doc link errors file"
$(doc_cmd) -b linkcheck $(doc_opts) $(doc_build_dir)/linkcheck
@echo
@echo "Makefile: Done creating the doc link errors file: $(doc_build_dir)/linkcheck/output.txt"
@echo "Makefile: Target $@ done."

.PHONY: doccoverage
doccoverage: develop_reqs_$(pymn).done
doccoverage: $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done
@echo "Makefile: Creating the doc coverage results file"
$(doc_cmd) -b coverage $(doc_opts) $(doc_build_dir)/coverage
@echo "Makefile: Done creating the doc coverage results file: $(doc_build_dir)/coverage/python.txt"
Expand Down Expand Up @@ -545,31 +548,31 @@ $(bdist_file) $(sdist_file): setup.py MANIFEST.in $(dist_included_files)
$(PYTHON_CMD) setup.py sdist -d $(dist_dir) bdist_wheel -d $(dist_dir) --universal
@echo "Makefile: Done creating the distribution archive files: $(bdist_file) $(sdist_file)"

pylint_$(pymn).done: develop_reqs_$(pymn).done Makefile $(pylint_rc_file) $(py_src_files)
$(done_dir)/pylint_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done Makefile $(pylint_rc_file) $(py_src_files)
@echo "Makefile: Running Pylint"
-$(call RM_FUNC,$@)
pylint --version
pylint $(pylint_opts) --rcfile=$(pylint_rc_file) $(py_src_files)
echo "done" >$@
@echo "Makefile: Done running Pylint"

mypy_$(pymn).done: develop_reqs_$(pymn).done Makefile $(py_src_files)
$(done_dir)/mypy_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done Makefile $(py_src_files)
@echo "Makefile: Running Mypy"
-$(call RM_FUNC,$@)
mypy --version
mypy $(mypy_opts) $(py_src_files)
echo "done" >$@
@echo "Makefile: Done running Mypy"

flake8_$(pymn).done: develop_reqs_$(pymn).done Makefile $(flake8_rc_file) $(py_src_files)
$(done_dir)/flake8_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done Makefile $(flake8_rc_file) $(py_src_files)
@echo "Makefile: Running Flake8"
-$(call RM_FUNC,$@)
flake8 --version
flake8 --statistics --config=$(flake8_rc_file) --filename='*' $(py_src_files)
echo "done" >$@
@echo "Makefile: Done running Flake8"

safety_$(pymn).done: develop_reqs_$(pymn).done Makefile $(safety_policy_file) minimum-constraints.txt
$(done_dir)/safety_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done Makefile $(safety_policy_file) minimum-constraints.txt
@echo "Makefile: Running pyup.io safety check"
-$(call RM_FUNC,$@)
safety check --policy-file $(safety_policy_file) -r minimum-constraints.txt --full-report
Expand Down
Empty file added done/.dummy
Empty file.

0 comments on commit b11790f

Please sign in to comment.