fix: removed run.py objects from the Dockerfiles in case_i, which were removed from the model repository.

fix: timedependent get_source() are able to clone into empty folder.

Author: pabloitu

floatcsep/model.py

@@ -310,7 +310,13 @@ def stage(
            and those to be generated, as well as input catalog and arguments file.
 
         """
-        if self.force_stage or not self.registry.path.exists():
+        need_source = (
+                self.force_stage
+                or not self.registry.path.exists()
+                or (self.registry.path.is_dir() and not any(self.registry.path.iterdir()))
+        )
+
+        if need_source:
             os.makedirs(self.registry.dir, exist_ok=True)
             self.get_source(self.zenodo_id, self.giturl, branch=self.repo_hash)
 

tutorials/case_i/pymock/Dockerfile

@@ -28,7 +28,7 @@ RUN python3 -m venv $VIRTUAL_ENV && pip install --upgrade pip setuptools wheel
 # Copy the repository from the local machine to the Docker container.
 ## *Only the needed folders/files for the model build*
 COPY --chown=$USER_UID:$USER_GID pymock/ ./pymock/
-COPY --chown=$USER_UID:$USER_GID setup.cfg run.py setup.py ./
+COPY --chown=$USER_UID:$USER_GID setup.cfg setup.py ./
 
 # Install the pymock package.
 ## *Uses pip to install setup.cfg and requirements/instructions therein*

tutorials/case_i/pymock_slow/Dockerfile

@@ -28,7 +28,7 @@ RUN python3 -m venv $VIRTUAL_ENV && pip install --upgrade pip setuptools wheel
 # Copy the repository from the local machine to the Docker container.
 ## *Only the needed folders/files for the model build*
 COPY --chown=$USER_UID:$USER_GID pymock/ ./pymock/
-COPY --chown=$USER_UID:$USER_GID setup.cfg run.py setup.py ./
+COPY --chown=$USER_UID:$USER_GID setup.cfg setup.py ./
 
 # Install the pymock package.
 ## *Uses pip to install setup.cfg and requirements/instructions therein*