python312Packages.craft-store: 3.0.2 -> 3.1.0; python312Packages.keyring_24: remove (#369875)

pkgs/development/python-modules/craft-store/default.nix

@@ -6,55 +6,67 @@
   setuptools,
   setuptools-scm,
   pytest-check,
+  pytest-httpx,
   pytest-mock,
-  pydantic,
   pyyaml,
   pytestCheckHook,
-  keyring_24,
+  annotated-types,
+  httpx,
+  jaraco-classes,
+  keyring,
   macaroonbakery,
   overrides,
+  pydantic,
   pyxdg,
   requests,
   requests-toolbelt,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "craft-store";
-  version = "3.0.2";
+  version = "3.1.0";
 
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-store";
-    rev = "refs/tags/${version}";
-    hash = "sha256-l8WnuaMJN4/nZRkWoU6omgbd4hKR2m7YC+YVcvAqzcA=";
+    tag = version;
+    hash = "sha256-pTG0JJRoHjmcLg+lAgg53rvC+7d3TLlTLe+Rxhy8wqg=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==" "setuptools>="
+      --replace-fail "setuptools==75.6.0" "setuptools"
   '';
 
-  build-system = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonRelaxDeps = [ "httpx" ];
 
   dependencies = [
-    keyring_24
+    annotated-types
+    httpx
+    jaraco-classes
+    keyring
     macaroonbakery
     overrides
     pydantic
     pyxdg
     requests
     requests-toolbelt
+    typing-extensions
   ];
 
-  pythonRelaxDeps = [ "macaroonbakery" ];
-
   pythonImportsCheck = [ "craft_store" ];
 
   nativeCheckInputs = [
-    pydantic
     pytest-check
+    pytest-httpx
     pytest-mock
     pytestCheckHook
     pyyaml

pkgs/development/python-modules/keyring_24/default.nix

@@ -1,81 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
-  installShellFiles,
-  setuptools,
-  setuptools-scm,
-  shtab,
-  importlib-metadata,
-  jaraco-classes,
-  jaraco-context,
-  jaraco-functools,
-  jeepney,
-  secretstorage,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "keyring_24";
-  # nixpkgs-update: no auto update
-  version = "24.3.1";
-  pyproject = true;
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "keyring";
-    hash = "sha256-wzJ7b/r8DovvvbWXys20ko/+XBIS92RfGG5tmVeomNs=";
-  };
-
-  nativeBuildInputs = [
-    installShellFiles
-    shtab
-  ];
-
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];
-
-  dependencies =
-    [
-      jaraco-classes
-      jaraco-context
-      jaraco-functools
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      jeepney
-      secretstorage
-    ]
-    ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];
-
-  postInstall = ''
-    installShellCompletion --cmd keyring \
-      --bash <($out/bin/keyring --print-completion bash) \
-      --zsh <($out/bin/keyring --print-completion zsh)
-  '';
-
-  pythonImportsCheck = [
-    "keyring"
-    "keyring.backend"
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  disabledTestPaths =
-    [ "tests/backends/test_macOS.py" ]
-    # These tests fail when sandboxing is enabled because they are unable to get a password from keychain.
-    ++ lib.optional stdenv.hostPlatform.isDarwin "tests/test_multiprocess.py";
-
-  meta = with lib; {
-    description = "Store and access your passwords safely";
-    homepage = "https://github.com/jaraco/keyring";
-    changelog = "https://github.com/jaraco/keyring/blob/v${version}/NEWS.rst";
-    license = licenses.mit;
-    mainProgram = "keyring";
-    maintainers = with maintainers; [ jnsgruk ];
-  };
-}

pkgs/development/python-modules/macaroonbakery/default.nix

@@ -24,13 +24,19 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "go-macaroon-bakery";
     repo = "py-macaroon-bakery";
-    rev = "refs/tags/${version}";
+    tag = version;
     hash = "sha256-NEhr8zkrHceeLbAyuUvc7U6dyQxkpkj0m5LlnBMafA0=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  # fix version string
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "VERSION = (1, 3, 3)" "VERSION = (1, 3, 4)"
+  '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     protobuf
     pymacaroons
     pynacl

pkgs/top-level/python-aliases.nix

@@ -319,6 +319,7 @@ mapAliases ({
   Kajiki = kajiki; # added 2023-02-19
   keepkey_agent = keepkey-agent; # added 2024-01-06
   Keras = keras; # added 2021-11-25
+  keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
   ldap = python-ldap; # added 2022-09-16
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
   langchainplus-sdk = langsmith; # added 2023-08-01

pkgs/top-level/python-packages.nix

@@ -6948,8 +6948,6 @@ self: super: with self; {
 
   keyring = callPackage ../development/python-modules/keyring { };
 
-  keyring_24 = callPackage ../development/python-modules/keyring_24 { };
-
   keyring-pass = callPackage ../development/python-modules/keyring-pass { };
 
   keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { };