feat(build): fluidattacks#990 move cache directory

Signed-off-by: Sebastian Cardona <[email protected]>

src/cli/main/cli.py

@@ -74,9 +74,9 @@
     highlight=False,
     file=io.TextIOWrapper(sys.stderr.buffer, write_through=True),
 )
-MAKES_DIR: str = join(environ["HOME_IMPURE"], ".makes")
-makedirs(join(MAKES_DIR, "cache"), exist_ok=True)
-SOURCES_CACHE: str = join(MAKES_DIR, "cache", "sources")
+MAKES_DIR: str = join(environ["HOME_IMPURE"], ".cache")
+makedirs(join(MAKES_DIR, "makes"), exist_ok=True)
+SOURCES_CACHE: str = join(MAKES_DIR, "makes", "sources")
 ON_EXIT: List[Callable[[], None]] = []
 VERSION: str = "23.06"
 
@@ -426,7 +426,7 @@ def _get_config(head: str, attr_paths: str) -> Config:
             head=head,
             out=out,
         ),
-        env=None if NIX_STABLE else dict(HOME=environ["HOME_IMPURE"]),
+        env=None if NIX_STABLE else {"HOME": environ["HOME_IMPURE"]},
         stderr=None,
         stdout=sys.stderr.fileno(),
     )
@@ -642,7 +642,7 @@ def _cli_build(  # pylint: disable=too-many-arguments
             head=head,
             out=out,
         ),
-        env=None if NIX_STABLE else dict(HOME=environ["HOME_IMPURE"]),
+        env=None if NIX_STABLE else {"HOME": environ["HOME_IMPURE"]},
         stderr=None,
         stdout=None,
     )

src/cli/test_all.py

@@ -48,7 +48,7 @@ def test_dot_hello_world() -> None:
 def test_remote_hello_world() -> None:
     cache = (
         os.environ["HOME_IMPURE"]
-        + "/.makes/cache/sources/github-fluidattacks-makes-main"
+        + "/.cache/makes/sources/github-fluidattacks-makes-main"
     )
 
     shutil.rmtree(cache, ignore_errors=True)