Skip to content

Commit 1071fef

Browse files
committed
Remove .done files for safety so it runs always
Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>
1 parent 96c1ea3 commit 1071fef

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

Makefile

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,6 @@ check: $(done_dir)/flake8_$(pymn)_$(PACKAGE_LEVEL).done
382382
check_reqs: $(done_dir)/check_reqs_$(pymn)_$(PACKAGE_LEVEL).done
383383
@echo "Makefile: $@ done."
384384

385-
.PHONY: safety
386-
safety: $(done_dir)/safety_develop_$(pymn)_$(PACKAGE_LEVEL).done $(done_dir)/safety_install_$(pymn)_$(PACKAGE_LEVEL).done
387-
@echo "Makefile: $@ done."
388-
389385
.PHONY: pylint
390386
pylint: $(done_dir)/pylint_$(pymn)_$(PACKAGE_LEVEL).done
391387
@echo "Makefile: $@ done."
@@ -629,19 +625,12 @@ $(done_dir)/mypy_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/develop_$(pymn)_$(PA
629625
@echo "Makefile: Done running Mypy"
630626
echo "done" >$@
631627

632-
$(done_dir)/safety_develop_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done $(safety_develop_policy_file) minimum-constraints-develop.txt minimum-constraints-install.txt
633-
-$(call RM_FUNC,$@)
634-
@echo "Makefile: Running Safety for development packages (and tolerate safety issues when RUN_TYPE is normal or scheduled)"
628+
.PHONY: safety
629+
safety: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done Makefile $(safety_develop_policy_file) $(safety_install_policy_file) minimum-constraints-develop.txt minimum-constraints-install.txt minimum-constraints-install.txt
630+
@echo "Makefile: Running Safety"
635631
bash -c "safety check --policy-file $(safety_develop_policy_file) -r minimum-constraints-develop.txt --full-report || test '$(RUN_TYPE)' == 'normal' || test '$(RUN_TYPE)' == 'scheduled' || exit 1"
636-
@echo "Makefile: Done running Safety for development packages"
637-
echo "done" >$@
638-
639-
$(done_dir)/safety_install_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done $(safety_install_policy_file) minimum-constraints-install.txt
640-
-$(call RM_FUNC,$@)
641-
@echo "Makefile: Running Safety for install packages (and tolerate safety issues when RUN_TYPE is normal)"
642632
bash -c "safety check --policy-file $(safety_install_policy_file) -r minimum-constraints-install.txt --full-report || test '$(RUN_TYPE)' == 'normal' || exit 1"
643-
@echo "Makefile: Done running Safety for install packages"
644-
echo "done" >$@
633+
@echo "Makefile: Done running Safety"
645634

646635
$(done_dir)/check_reqs_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done minimum-constraints-develop.txt minimum-constraints-install.txt requirements.txt
647636
@echo "Makefile: Checking missing dependencies of the package"

0 commit comments

Comments
 (0)