Finally fixes fix script with "marker" files for install targets.

Makefile

@@ -1,4 +1,4 @@
-# Generated by Medikit 0.5.15 on 2018-03-19.
+# Generated by Medikit 0.5.16 on 2018-03-19.
 # All changes will be overriden.
 # Edit Projectfile and run “make update” (or “medikit update”) to regenerate.
 
@@ -23,7 +23,7 @@ YAPF_OPTIONS ?= -rip
 SPHINX_AUTOBUILD ?= $(PYTHON_DIRNAME)/sphinx-autobuild
 MEDIKIT ?= $(PYTHON) -m medikit
 MEDIKIT_UPDATE_OPTIONS ?= 
-MEDIKIT_VERSION ?= 0.5.15
+MEDIKIT_VERSION ?= 0.5.16
 
 .PHONY: $(SPHINX_SOURCEDIR) clean format help install install-dev medikit quick release test update update-requirements watch-$(SPHINX_SOURCEDIR)
 
@@ -41,6 +41,10 @@ else
 	@mkdir -p .medikit; touch $@
 endif
 
+clean:   ## Cleans up the working copy.
+	rm -rf build dist *.egg-info .medikit/install .medikit/install-dev
+	find . -name __pycache__ -type d | xargs rm -rf
+
 install-dev: .medikit/install-dev   ## Installs the project (with dev dependencies).
 .medikit/install-dev: $(PYTHON_REQUIREMENTS_DEV_FILE) $(PYTHON_REQUIREMENTS_FILE) setup.py
 	$(eval target := $(shell echo $@ | rev | cut -d/ -f1 | rev))
@@ -55,11 +59,6 @@ else
 	@mkdir -p .medikit; touch $@
 endif
 
-clean:   ## Cleans up the local mess.
-	rm .medikit/*
-	rm -rf build dist *.egg-info
-	find . -name __pycache__ -type d | xargs rm -rf
-
 quick:   #
 	@printf ""
 

medikit/_version.py

@@ -1 +1 @@
-__version__ = '0.5.15'
+__version__ = '0.5.16'

medikit/feature/make/__init__.py

@@ -49,7 +49,6 @@ def on_start(self, event):
         for extra in event.config['make'].extras:
             self.makefile.add_install_target(extra)
 
-        self.makefile.add_target('clean', CleanScript(), phony=True, doc='''Cleans up the local mess.''')
         self.makefile.add_target('quick', Script('@printf ""'), phony=True, hidden=True)
 
         self.dispatcher.dispatch(

medikit/feature/make/resources.py

@@ -106,6 +106,11 @@ def add_target(self, target, rule, *, deps=None, phony=False, first=False, doc=N
         if hidden:
             self.hidden.add(target)
 
+    def get_clean_target(self):
+        if not self.has_target('clean'):
+            self.add_target('clean', CleanScript(), phony=True, doc='''Cleans up the working copy.''')
+        return self.get_target('clean')
+
     def add_install_target(self, extra=None):
         if extra:
             target = 'install-' + extra
@@ -116,6 +121,11 @@ def add_install_target(self, extra=None):
 
         if not self.has_target(target):
             self.add_target(target, InstallScript(), phony=True, doc=doc)
+
+        clean_target = self.get_clean_target()
+        marker = '.medikit/' + target
+        if not marker in clean_target.remove:
+            clean_target.remove.append(marker)
         return self.get_target(target)
 
     def get_target(self, target):
@@ -191,8 +201,6 @@ class CleanScript(Script):
     ]
 
     def __iter__(self):
-        # remove the task complete markers, but don't remove subdirectories
-        yield 'rm .medikit/*'
         # cleanup build directories
         yield 'rm -rf {}'.format(' '.join(self.remove))
         # cleanup python bytecode -

medikit/feature/pytest.py

@@ -16,9 +16,7 @@ class PytestFeature(Feature):
 
     @subscribe('medikit.feature.python.on_generate')
     def on_python_generate(self, event):
-        event.config['python'].add_requirements(
-            dev=['coverage ~=4.4', 'pytest ~=3.4', 'pytest-cov ~=2.5']
-        )
+        event.config['python'].add_requirements(dev=['coverage ~=4.4', 'pytest ~=3.4', 'pytest-cov ~=2.5'])
 
     @subscribe('medikit.feature.make.on_generate', priority=SUPPORT_PRIORITY)
     def on_make_generate(self, event):

medikit/file.py

@@ -6,6 +6,7 @@
 
 ENCODING = 'utf-8'
 
+
 class FileEvent(Event):
     def __init__(self, filename, executable, override):
         super(FileEvent, self).__init__()

setup.py

@@ -1,4 +1,4 @@
-# Generated by Medikit 0.5.15 on 2018-03-19.
+# Generated by Medikit 0.5.16 on 2018-03-19.
 # All changes will be overriden.
 # Edit Projectfile and run “make update” (or “medikit update”) to regenerate.