Unverified Commit 82d04a31 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #335365 from natsukium/pdm/update

pdm: 2.18.0 -> 2.18.1; python312Packages.unearth: 0.16.1 -> 0.17.0
parents 2b875be1 cf93c92e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@

buildPythonPackage rec {
  pname = "unearth";
  version = "0.16.1";
  version = "0.17.0";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-mIpDQY+gt4rrYooV9qOwIVLBeH9j/m0lTH9OLM+NsKc=";
    hash = "sha256-dxyicP7IvqJid0oLHOJ1JzkFbmUjRDQCjs6vRmy7oLY=";
  };

  build-system = [ pdm-backend ];
+55 −66
Original line number Diff line number Diff line
{ lib
, python3
, fetchPypi
, nix-update-script
, runtimeShell
, installShellFiles
, testers
, pdm
{
  lib,
  python3,
  fetchFromGitHub,
  runtimeShell,
  installShellFiles,
  testers,
  pdm,
}:

with python3.pkgs;
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
  pname = "pdm";
  version = "2.18.0";
  version = "2.18.1";
  pyproject = true;

  disabled = pythonOlder "3.8";
  disabled = python3.pkgs.pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-+WP48VWMD/lNrYK54xIS1V0MWdIVIH4PXgQG1Bsql9w=";
  src = fetchFromGitHub {
    owner = "pdm-project";
    repo = "pdm";
    rev = "refs/tags/${version}";
    hash = "sha256-pCBwt55tu9bEVVHfdPsJ5vaJXVXEZ2+4ft9LathwBt0=";
  };

  nativeBuildInputs = [
    installShellFiles
  ];
  nativeBuildInputs = [ installShellFiles ];

  build-system = [
  build-system = with python3.pkgs; [
    pdm-backend
    pdm-build-locked
  ];

  dependencies = [
  dependencies =
    with python3.pkgs;
    [
      blinker
      dep-logic
      filelock
@@ -48,26 +49,17 @@ buildPythonApplication rec {
      rich
      shellingham
      tomlkit
      truststore
      unearth
      virtualenv
  ] ++ httpx.optional-dependencies.socks
  ++ lib.optionals (pythonOlder "3.11") [
    tomli
    ]
  ++ lib.optionals (pythonOlder "3.10") [
    importlib-metadata
  ]
  ++ lib.optionals (pythonAtLeast "3.10") [
    truststore
  ];
    ++ httpx.optional-dependencies.socks;

  makeWrapperArgs = [
    "--set PDM_CHECK_UPDATE 0"
  ];
  makeWrapperArgs = [ "--set PDM_CHECK_UPDATE 0" ];

  preInstall = ''
  # Silence network warning during pypaInstallPhase
  # by disabling latest version check
  preInstall = ''
    export PDM_CHECK_UPDATE=0
  '';

@@ -80,7 +72,7 @@ buildPythonApplication rec {
    unset PDM_LOG_DIR
  '';

  nativeCheckInputs = [
  nativeCheckInputs = with python3.pkgs; [
    first
    pytestCheckHook
    pytest-mock
@@ -88,9 +80,7 @@ buildPythonApplication rec {
    pytest-httpserver
  ];

  pytestFlagsArray = [
    "-m 'not network'"
  ];
  pytestFlagsArray = [ "-m 'not network'" ];

  preCheck = ''
    export HOME=$TMPDIR
@@ -115,18 +105,17 @@ buildPythonApplication rec {

  __darwinAllowLocalNetworking = true;

  passthru.tests.version = testers.testVersion {
    package = pdm;
  };

  passthru.updateScript = nix-update-script { };
  passthru.tests.version = testers.testVersion { package = pdm; };

  meta = with lib; {
    homepage = "https://pdm-project.org";
    changelog = "https://github.com/pdm-project/pdm/releases/tag/${version}";
    description = "Modern Python package and dependency manager supporting the latest PEP standards";
    license = licenses.mit;
    maintainers = with maintainers; [ cpcloud ];
    maintainers = with maintainers; [
      cpcloud
      natsukium
    ];
    mainProgram = "pdm";
  };
}