esd-spack-installation: package renaming to dedal

.gitlab-ci.yml

@@ -6,7 +6,6 @@ variables:
   BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/esd/tmp:latest
 
 
-
 build-wheel:
   stage: build
   tags:
@@ -40,6 +39,5 @@ testing-pytest:
     paths:
       - test-results.xml
       - .dedal.log
-      - .generate_cache.log
     expire_in: 1 week
 

esd/configuration/SpackConfig.py → dedal/configuration/SpackConfig.py

 import os
 from pathlib import Path
 
-from esd.configuration.GpgConfig import GpgConfig
-from esd.model import SpackDescriptor
+from dedal.configuration.GpgConfig import GpgConfig
+from dedal.model import SpackDescriptor
 
 
 class SpackConfig:

esd/spack_factory/SpackOperation.py → dedal/spack_factory/SpackOperation.py

@@ -2,13 +2,13 @@ import os
 import re
 import subprocess
 from pathlib import Path
-from esd.error_handling.exceptions import BashCommandException, NoSpackEnvironmentException, \
+from dedal.error_handling.exceptions import BashCommandException, NoSpackEnvironmentException, \
     SpackInstallPackagesException, SpackConcertizeException, SpackMirrorException, SpackGpgException
-from esd.logger.logger_builder import get_logger
-from esd.configuration.SpackConfig import SpackConfig
-from esd.tests.testing_variables import SPACK_VERSION
-from esd.wrapper.spack_wrapper import check_spack_env
-from esd.utils.utils import run_command, git_clone_repo, log_command, set_bashrc_variable
+from dedal.logger.logger_builder import get_logger
+from dedal.configuration.SpackConfig import SpackConfig
+from dedal.tests.testing_variables import SPACK_VERSION
+from dedal.wrapper.spack_wrapper import check_spack_env
+from dedal.utils.utils import run_command, git_clone_repo, log_command, set_bashrc_variable
 
 
 class SpackOperation:

esd/spack_factory/SpackOperationCreator.py → dedal/spack_factory/SpackOperationCreator.py

-from esd.configuration.SpackConfig import SpackConfig
-from esd.spack_factory.SpackOperation import SpackOperation
-from esd.spack_factory.SpackOperationUseCache import SpackOperationUseCache
+from dedal.configuration.SpackConfig import SpackConfig
+from dedal.spack_factory.SpackOperation import SpackOperation
+from dedal.spack_factory.SpackOperationUseCache import SpackOperationUseCache
 
 
 class SpackOperationCreator:

esd/spack_factory/SpackOperationUseCache.py → dedal/spack_factory/SpackOperationUseCache.py

 import os
-from esd.build_cache.BuildCacheManager import BuildCacheManager
-from esd.logger.logger_builder import get_logger
-from esd.spack_factory.SpackOperation import SpackOperation
-from esd.configuration.SpackConfig import SpackConfig
+from dedal.build_cache.BuildCacheManager import BuildCacheManager
+from dedal.logger.logger_builder import get_logger
+from dedal.spack_factory.SpackOperation import SpackOperation
+from dedal.configuration.SpackConfig import SpackConfig
 
 
 class SpackOperationUseCache(SpackOperation):

dedal/tests/spack_from_scratch_test.py

 from pathlib import Path
 import pytest
-from esd.configuration.SpackConfig import SpackConfig
-from esd.error_handling.exceptions import BashCommandException, NoSpackEnvironmentException
-from esd.spack_factory.SpackOperationCreator import SpackOperationCreator
-from esd.model.SpackDescriptor import SpackDescriptor
-from esd.tests.testing_variables import test_spack_env_git, ebrains_spack_builds_git
-from esd.utils.utils import file_exists_and_not_empty
+from dedal.configuration.SpackConfig import SpackConfig
+from dedal.error_handling.exceptions import BashCommandException, NoSpackEnvironmentException
+from dedal.spack_factory.SpackOperationCreator import SpackOperationCreator
+from dedal.model.SpackDescriptor import SpackDescriptor
+from dedal.tests.testing_variables import test_spack_env_git, ebrains_spack_builds_git
+from dedal.utils.utils import file_exists_and_not_empty
 
 
 def test_spack_repo_exists_1():

dedal/tests/spack_install_test.py

 import pytest
-from esd.spack_factory.SpackOperation import SpackOperation
-from esd.tests.testing_variables import SPACK_VERSION
+from dedal.spack_factory.SpackOperation import SpackOperation
+from dedal.tests.testing_variables import SPACK_VERSION
 
 
 # run this test first so that spack is installed only once for all the tests

dedal/tests/utils_test.py

 import pytest
 from pathlib import Path
 
-from dedal.utils.utils import clean_up
+from dedal.utils.utils import clean_up, file_exists_and_not_empty
 
 
 @pytest.fixture

dedal/utils/utils.py

@@ -4,7 +4,7 @@ import shutil
 import subprocess
 from pathlib import Path
 
-from esd.error_handling.exceptions import BashCommandException
+from dedal.error_handling.exceptions import BashCommandException
 import re
 
 

esd/wrapper/spack_wrapper.py → dedal/wrapper/spack_wrapper.py

 import functools
 
-from esd.error_handling.exceptions import NoSpackEnvironmentException
+from dedal.error_handling.exceptions import NoSpackEnvironmentException
 
 
 def check_spack_env(method):