calkit-python 0.49.1__tar.gz → 0.49.2__tar.gz

{calkit_python-0.49.1 → calkit_python-0.49.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: calkit-python
-Version: 0.49.1
+Version: 0.49.2
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://calkit.org
 Project-URL: Issues, https://github.com/calkit/calkit/issues

{calkit_python-0.49.1 → calkit_python-0.49.2}/calkit/cli/check.py

@@ -2053,7 +2053,7 @@ def check_venv(
             )
         # Last, so an interrupted relock isn't taken as current
         calkit.environments.write_env_spec_hash(
-            lock_fpath, path, python=python, wdir=wdir
+            lock_fpath, spec_hash, wdir=wdir
         )
         # Delete legacy lock file after use
         if used_legacy_lock:

{calkit_python-0.49.1 → calkit_python-0.49.2}/calkit/conda.py

@@ -995,7 +995,7 @@ def check_env(
             relock=spec_changed and recorded_hash is not None,
         )
     # Last, so an interrupted relock isn't taken as current
-    write_env_spec_hash(lock_fpath, env_fpath)
+    write_env_spec_hash(lock_fpath, spec_hash)
     return res
 
 

{calkit_python-0.49.1 → calkit_python-0.49.2}/calkit/environments.py

@@ -1750,7 +1750,7 @@ def env_spec_hash(spec_fpath: str, python: str | None = None) -> str:
     if python is not None:
         content += f"\npython={python}"
     # Named so a reader knows what to check it with
-    return "md5:" + hashlib.md5(content.encode()).hexdigest()
+    return "sha256:" + hashlib.sha256(content.encode()).hexdigest()
 
 
 def _env_spec_hash_key(lock_fpath: str, wdir: str | None) -> str:
@@ -1760,8 +1760,11 @@ def _env_spec_hash_key(lock_fpath: str, wdir: str | None) -> str:
     if lock_dir and os.path.splitext(name)[0] in CONDA_VENV_ARCHS:
         lock_fpath = lock_dir
     if os.path.isabs(lock_fpath):
-        lock_fpath = os.path.relpath(lock_fpath, wdir or ".")
-    return Path(lock_fpath).as_posix()
+        try:
+            lock_fpath = os.path.relpath(lock_fpath, wdir or ".")
+        except ValueError:  # On another Windows drive
+            pass
+    return Path(os.path.normpath(lock_fpath)).as_posix()
 
 
 def read_env_spec_hash(lock_fpath: str, wdir: str | None = None) -> str | None:
@@ -1775,16 +1778,17 @@ def read_env_spec_hash(lock_fpath: str, wdir: str | None = None) -> str | None:
         return None
     if not isinstance(hashes, dict):
         return None
-    return hashes.get(_env_spec_hash_key(lock_fpath, wdir))
+    value = hashes.get(_env_spec_hash_key(lock_fpath, wdir))
+    # Older md5 hashes would make every lock look stale, so they're ignored
+    if isinstance(value, str) and value.startswith("sha256:"):
+        return value
+    return None
 
 
 def write_env_spec_hash(
-    lock_fpath: str,
-    spec_fpath: str,
-    python: str | None = None,
-    wdir: str | None = None,
+    lock_fpath: str, spec_hash: str, wdir: str | None = None
 ) -> None:
-    """Record that a lock was resolved from the spec as it is now.
+    """Record that a lock was resolved from a spec with the given hash.
 
     Kept outside the lock directory, which stages depend on, so recording
     it for a lock that already matches its spec reruns nothing.
@@ -1797,11 +1801,15 @@ def write_env_spec_hash(
         hashes = {}
     if not isinstance(hashes, dict):
         hashes = {}
+    hashes = {
+        k: v
+        for k, v in hashes.items()
+        if isinstance(v, str) and v.startswith("sha256:")
+    }
     key = _env_spec_hash_key(lock_fpath, wdir)
-    value = env_spec_hash(os.path.join(wdir or "", spec_fpath), python=python)
-    if hashes.get(key) == value:
+    if hashes.get(key) == spec_hash:
         return
-    hashes[key] = value
+    hashes[key] = spec_hash
     os.makedirs(os.path.dirname(fpath), exist_ok=True)
     with open(fpath, "w", encoding="utf-8", newline="\n") as f:
         json.dump(hashes, f, indent=2, sort_keys=True)

{calkit_python-0.49.1 → calkit_python-0.49.2}/calkit/tests/test_environments.py

@@ -2055,7 +2055,7 @@ def test_env_spec_hashes(tmp_dir):
     write(lock, "idna==3.10\n")
     # Recorded beside the lock, not in it
     assert envs.read_env_spec_hash(lock) is None
-    envs.write_env_spec_hash(lock, spec)
+    envs.write_env_spec_hash(lock, envs.env_spec_hash(spec))
     assert envs.read_env_spec_hash(lock) == envs.env_spec_hash(spec)
     with open(lock) as f:
         assert f.read() == "idna==3.10\n"
@@ -2094,18 +2094,29 @@ def test_env_spec_hashes(tmp_dir):
     write(os.path.join("sub", spec), "idna\n")
     envs.write_env_spec_hash(
         os.path.join(".calkit", "env-locks", "py", "linux-64.txt"),
-        spec,
+        envs.env_spec_hash(os.path.join("sub", spec)),
         wdir="sub",
     )
     assert envs.read_env_spec_hash(
         os.path.join(".calkit", "env-locks", "py", "win-64.txt"), wdir="sub"
     ) == envs.env_spec_hash(os.path.join("sub", spec))
     with open(os.path.join("sub", envs.ENV_SPEC_HASHES_FPATH)) as f:
-        assert list(json.load(f)) == [".calkit/env-locks/py"]
+        assert json.load(f) == {
+            ".calkit/env-locks/py": envs.env_spec_hash(
+                os.path.join("sub", spec)
+            )
+        }
+    assert envs.env_spec_hash(spec).startswith("sha256:")
+    # Older md5 hashes aren't read, and are dropped on the next write
+    write(envs.ENV_SPEC_HASHES_FPATH, json.dumps({"old": "md5:abc"}))
+    assert envs.read_env_spec_hash("old") is None
+    envs.write_env_spec_hash(lock, envs.env_spec_hash(spec))
+    with open(envs.ENV_SPEC_HASHES_FPATH) as f:
+        assert list(json.load(f)) == [lock]
     # An unreadable file records nothing, and is replaced on the next write
     write(envs.ENV_SPEC_HASHES_FPATH, "not json")
     assert envs.read_env_spec_hash(lock) is None
-    envs.write_env_spec_hash(lock, spec)
+    envs.write_env_spec_hash(lock, envs.env_spec_hash(spec))
     assert envs.read_env_spec_hash(lock) == envs.env_spec_hash(spec)
 
 

{calkit_python-0.49.1 → calkit_python-0.49.2}/hub/frontend/src/routes/_layout/$accountName/$projectName/_layout/index.tsx

@@ -238,8 +238,10 @@ function ProjectView() {
             />
           ) : null}
           {/* Each of these sits above the next, so hold them all until all
-              have landed rather than shoving the README down mid-read */}
-          {(checklistProject && !checklistSettled) ||
+              have landed rather than shoving the README down mid-read; the
+              project says whether there's a checklist to wait for */}
+          {projectRequest.isPending ||
+          (checklistProject && !checklistSettled) ||
           showcaseRequest.isPending ||
           readmeRequest.isPending ? (
             <Box py={4} px={6} mb={4} borderRadius="lg" bg={secBgColor}>

{calkit_python-0.49.1 → calkit_python-0.49.2}/hub/frontend/src/routes/_layout/$accountName/$projectName/_layout.tsx

@@ -29,7 +29,6 @@ import {
   ModalOverlay,
   Portal,
   Skeleton,
-  SkeletonText,
   Spinner,
   Text,
   VStack,
@@ -509,176 +508,171 @@ function ProjectLayout() {
 
   return (
     <>
-      {isPending ? (
-        // The frame the project fills in, so the page arrives in place, with
-        // the same children ahead of the sidebar so it isn't remounted
-        <Flex>
-          <ProjectCommandPalette />
-          <Sidebar basePath={`/${accountName}/${projectName}`} />
-          <Container maxW="full" mx={6} px={0}>
-            <Skeleton mt={5} mb={4} height="36px" width="40%" />
-            <SkeletonText noOfLines={12} spacing={3} skeletonHeight="14px" />
-          </Container>
-        </Flex>
-      ) : (
-        <Flex>
-          <ProjectCommandPalette />
-          <Sidebar basePath={`/${accountName}/${projectName}`} />
+      <Flex>
+        <ProjectCommandPalette />
+        <Sidebar basePath={`/${accountName}/${projectName}`} />
+        <Container
+          maxW="full"
+          mx={6}
+          height="calc(100vh - 64px)"
+          overflow="hidden"
+          display="flex"
+          flexDirection="column"
+          px={0}
+        >
           <Container
-            maxW="full"
-            mx={6}
-            height="calc(100vh - 64px)"
-            overflow="hidden"
+            maxW="100%"
+            alignContent="center"
+            alignItems="center"
+            mt={5}
+            mb={4}
             display="flex"
-            flexDirection="column"
+            flexWrap="wrap"
             px={0}
+            flexShrink={0}
           >
-            <Container
-              maxW="100%"
-              alignContent="center"
-              alignItems="center"
-              mt={5}
-              mb={4}
-              display="flex"
-              flexWrap="wrap"
-              px={0}
-              flexShrink={0}
-            >
-              <Box maxW="100%" mr={2}>
-                <Heading size={titleSize}>{project?.title}</Heading>
-              </Box>
-              {currentRef && currentRef !== defaultBranch?.name && (
-                <Box mr={2} pb={0.5} alignSelf="center">
-                  <Code
-                    fontSize="xs"
-                    cursor="pointer"
-                    title="Click to reset to default branch"
-                    onClick={() => setRef(undefined)}
-                    px={2}
-                    py={0.5}
-                    borderRadius="md"
-                    colorScheme="orange"
-                  >
-                    {currentRef} ✕
-                  </Code>
+            {/* Only the title waits on the project; the page below renders
+                its own placeholders in its own shape meanwhile */}
+            {isPending ? (
+              <Skeleton height="36px" width="40%" />
+            ) : (
+              <>
+                <Box maxW="100%" mr={2}>
+                  <Heading size={titleSize}>{project?.title}</Heading>
                 </Box>
-              )}
-              {/* Public/private badge */}
-              <Box mr={2} pb={0.5}>
-                <Badge
-                  color={project?.is_public ? "green.500" : "yellow.500"}
-                  onClick={() => {
-                    !project?.is_public ? projectPublicModal.onOpen() : null
-                  }}
-                  cursor={!project?.is_public ? "pointer" : "default"}
-                >
-                  {project?.is_public ? "Public" : "Private"}
-                </Badge>
-                {project && !project?.is_public ? (
-                  <MakeProjectPublic
-                    project={project}
-                    isOpen={projectPublicModal.isOpen}
-                    onClose={projectPublicModal.onClose}
-                  />
-                ) : (
-                  ""
+                {currentRef && currentRef !== defaultBranch?.name && (
+                  <Box mr={2} pb={0.5} alignSelf="center">
+                    <Code
+                      fontSize="xs"
+                      cursor="pointer"
+                      title="Click to reset to default branch"
+                      onClick={() => setRef(undefined)}
+                      px={2}
+                      py={0.5}
+                      borderRadius="md"
+                      colorScheme="orange"
+                    >
+                      {currentRef} ✕
+                    </Code>
+                  </Box>
                 )}
-              </Box>
-              {/* Status badge */}
-              <Box mr={2} pb={0.5}>
-                <Link>
+                {/* Public/private badge */}
+                <Box mr={2} pb={0.5}>
                   <Badge
-                    color={
-                      project?.status === "in-progress"
-                        ? "green.500"
-                        : project?.status === "completed"
-                          ? "blue.500"
-                          : "gray.500"
-                    }
-                    onClick={projectStatusModal.onOpen}
+                    color={project?.is_public ? "green.500" : "yellow.500"}
+                    onClick={() => {
+                      !project?.is_public ? projectPublicModal.onOpen() : null
+                    }}
+                    cursor={!project?.is_public ? "pointer" : "default"}
                   >
-                    {project?.status
-                      ? project.status.replaceAll("-", " ")
-                      : "no status"}
+                    {project?.is_public ? "Public" : "Private"}
                   </Badge>
-                </Link>
-                {project ? (
-                  <ProjectStatus
-                    project={project}
-                    isOpen={projectStatusModal.isOpen}
-                    onClose={projectStatusModal.onClose}
-                  />
-                ) : (
-                  ""
-                )}
-              </Box>
-              {/* GitHub link */}
-              {project?.git_repo_url ? (
-                <Box mr={2}>
-                  <Link href={project?.git_repo_url} isExternal>
-                    <Flex alignItems="center">
-                      <Icon as={FaGithub} pt={0.5} />
-                      <Icon as={ExternalLinkIcon} />
-                    </Flex>
-                  </Link>
+                  {project && !project?.is_public ? (
+                    <MakeProjectPublic
+                      project={project}
+                      isOpen={projectPublicModal.isOpen}
+                      onClose={projectPublicModal.onClose}
+                    />
+                  ) : (
+                    ""
+                  )}
                 </Box>
-              ) : (
-                ""
-              )}
-              <Box mr={2}>
-                <Flex>
+                {/* Status badge */}
+                <Box mr={2} pb={0.5}>
+                  <Link>
+                    <Badge
+                      color={
+                        project?.status === "in-progress"
+                          ? "green.500"
+                          : project?.status === "completed"
+                            ? "blue.500"
+                            : "gray.500"
+                      }
+                      onClick={projectStatusModal.onOpen}
+                    >
+                      {project?.status
+                        ? project.status.replaceAll("-", " ")
+                        : "no status"}
+                    </Badge>
+                  </Link>
                   {project ? (
-                    <ProjectMenu
+                    <ProjectStatus
                       project={project}
-                      userHasWriteAccess={userHasWriteAccess}
-                      branches={branches}
-                      currentRef={currentRef}
-                      defaultBranchName={defaultBranch?.name}
-                      onSetRef={setRef}
-                      accountName={accountName}
-                      projectName={projectName}
+                      isOpen={projectStatusModal.isOpen}
+                      onClose={projectStatusModal.onClose}
                     />
                   ) : (
                     ""
                   )}
-                  <IconButton
-                    isRound
-                    aria-label="Open help"
-                    size={"xs"}
-                    onClick={onClickHelp}
-                    icon={<FaQuestion />}
-                  />
-                </Flex>
-              </Box>
-              <Box>
-                {project?.description ? (
-                  <Text fontSize="small">→ {project.description}</Text>
+                </Box>
+                {/* GitHub link */}
+                {project?.git_repo_url ? (
+                  <Box mr={2}>
+                    <Link href={project?.git_repo_url} isExternal>
+                      <Flex alignItems="center">
+                        <Icon as={FaGithub} pt={0.5} />
+                        <Icon as={ExternalLinkIcon} />
+                      </Flex>
+                    </Link>
+                  </Box>
                 ) : (
                   ""
                 )}
-              </Box>
-            </Container>
-            <Box flex={1} overflowY="auto" minH={0}>
-              <Outlet />
-            </Box>
+                <Box mr={2}>
+                  <Flex>
+                    {project ? (
+                      <ProjectMenu
+                        project={project}
+                        userHasWriteAccess={userHasWriteAccess}
+                        branches={branches}
+                        currentRef={currentRef}
+                        defaultBranchName={defaultBranch?.name}
+                        onSetRef={setRef}
+                        accountName={accountName}
+                        projectName={projectName}
+                      />
+                    ) : (
+                      ""
+                    )}
+                    <IconButton
+                      isRound
+                      aria-label="Open help"
+                      size={"xs"}
+                      onClick={onClickHelp}
+                      icon={<FaQuestion />}
+                    />
+                  </Flex>
+                </Box>
+                <Box>
+                  {project?.description ? (
+                    <Text fontSize="small">→ {project.description}</Text>
+                  ) : (
+                    ""
+                  )}
+                </Box>
+              </>
+            )}
           </Container>
-          <Drawer
-            isOpen={helpDrawer.isOpen}
-            onClose={helpDrawer.onClose}
-            placement="right"
-            size="sm"
-          >
-            <DrawerOverlay />
-            <DrawerContent>
-              <DrawerCloseButton />
-              <DrawerHeader>Help</DrawerHeader>
-              <DrawerBody>
-                <HelpContent userHasWriteAccess={userHasWriteAccess} />
-              </DrawerBody>
-            </DrawerContent>
-          </Drawer>
-        </Flex>
-      )}
+          <Box flex={1} overflowY="auto" minH={0}>
+            <Outlet />
+          </Box>
+        </Container>
+        <Drawer
+          isOpen={helpDrawer.isOpen}
+          onClose={helpDrawer.onClose}
+          placement="right"
+          size="sm"
+        >
+          <DrawerOverlay />
+          <DrawerContent>
+            <DrawerCloseButton />
+            <DrawerHeader>Help</DrawerHeader>
+            <DrawerBody>
+              <HelpContent userHasWriteAccess={userHasWriteAccess} />
+            </DrawerBody>
+          </DrawerContent>
+        </Drawer>
+      </Flex>
     </>
   )
 }