diff --git a/esd/tests/spack_from_scratch_test.py b/esd/tests/spack_from_scratch_test.py index c059ab4564e66f8ec1877dc0b3279979e5bd0e21..d1aca83cc8f83f4cc7e2a32725b87ee9d8fb1e53 100644 --- a/esd/tests/spack_from_scratch_test.py +++ b/esd/tests/spack_from_scratch_test.py @@ -11,14 +11,14 @@ from esd.utils.utils import file_exists_and_not_empty def test_spack_repo_exists_1(): - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH) + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH) assert spack_manager.spack_repo_exists('ebrains-spack-builds') == False def test_spack_repo_exists_2(tmp_path): install_dir = tmp_path env = SpackModel('ebrains-spack-builds', install_dir) - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env) + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env) with pytest.raises(NoSpackEnvironmentException): spack_manager.spack_repo_exists(env.env_name) @@ -26,7 +26,7 @@ def test_spack_repo_exists_2(tmp_path): def test_spack_repo_exists_3(tmp_path): install_dir = tmp_path env = SpackModel('ebrains-spack-builds', install_dir) - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env) + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env) spack_manager.setup_spack_env() assert spack_manager.spack_repo_exists(env.env_name) == False @@ -35,7 +35,7 @@ def test_spack_from_scratch_setup_1(tmp_path): install_dir = tmp_path env = SpackModel('ebrains-spack-builds', install_dir, 'https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds.git', ) - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, system_name='ebrainslab') spack_manager.setup_spack_env() assert spack_manager.spack_repo_exists(env.env_name) == False @@ -46,7 +46,7 @@ def test_spack_from_scratch_setup_2(tmp_path): env = SpackModel('ebrains-spack-builds', install_dir, 'https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds.git', ) repo = env - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, repos=[repo, repo], system_name='ebrainslab') spack_manager.setup_spack_env() @@ -57,7 +57,7 @@ def test_spack_from_scratch_setup_3(tmp_path): install_dir = tmp_path env = SpackModel('new_env1', install_dir) repo = env - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, repos=[repo, repo], system_name='ebrainslab') with pytest.raises(BashCommandException): @@ -67,7 +67,7 @@ def test_spack_from_scratch_setup_3(tmp_path): def test_spack_from_scratch_setup_4(tmp_path): install_dir = tmp_path env = SpackModel('new_env2', install_dir) - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env) + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env) spack_manager.setup_spack_env() assert spack_manager.spack_env_exists() == True @@ -75,7 +75,7 @@ def test_spack_from_scratch_setup_4(tmp_path): def test_spack_not_a_valid_repo(): env = SpackModel('ebrains-spack-builds', Path(), None) repo = env - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, repos=[repo], system_name='ebrainslab') with pytest.raises(NoSpackEnvironmentException): @@ -87,7 +87,7 @@ def test_spack_from_scratch_concretize_1(tmp_path): env = SpackModel('ebrains-spack-builds', install_dir, 'https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds.git', ) repo = env - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, repos=[repo, repo], + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, repos=[repo, repo], system_name='ebrainslab') spack_manager.setup_spack_env() spack_manager.concretize_spack_env(force=True) @@ -100,7 +100,7 @@ def test_spack_from_scratch_concretize_2(tmp_path): env = SpackModel('ebrains-spack-builds', install_dir, 'https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds.git', ) repo = env - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, repos=[repo, repo], + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, repos=[repo, repo], system_name='ebrainslab') spack_manager.setup_spack_env() spack_manager.concretize_spack_env(force=False) @@ -113,7 +113,7 @@ def test_spack_from_scratch_concretize_3(tmp_path): env = SpackModel('ebrains-spack-builds', install_dir, 'https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds.git', ) repo = env - spack_manager: SpackManagerScratch = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, + spack_manager = SpackManagerCreator.get_spack_manger(SpackManagerEnum.FROM_SCRATCH, env=env, repos=[repo, repo], system_name='ebrainslab') spack_manager.setup_spack_env()