Unverified Commit 73688f66 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

python313Packages: don't apply the previous three commits yet

The point is to reduce the rebuilds for now,
as we need these to fix python314Packages.cmd2.
parent 67bb5197
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -12,16 +12,21 @@
  rich-argparse,
  setuptools-scm,
  wcwidth,
  python,
}:

buildPythonPackage rec {
  pname = "cmd2";
  version = "3.2.1";
  version = if python.isPy313 then "3.1.0" else "3.2.1";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-bGNyobJs0Uu2IJZTyJ1zAP58FDno3KMPW2tv/bXyFPo=";
    hash =
      if python.isPy313 then
        "sha256-zOOuzgGLCxBVmIraoraHrJwd84v9Kr/Cnb61GpcH3jM="
      else
        "sha256-bGNyobJs0Uu2IJZTyJ1zAP58FDno3KMPW2tv/bXyFPo=";
  };

  build-system = [ setuptools-scm ];
+3 −0
Original line number Diff line number Diff line
{
  lib,
  buildPythonPackage,
  python,
  fetchFromGitHub,
  hatchling,
  pytestCheckHook,
@@ -28,6 +29,8 @@ buildPythonPackage rec {
  disabledTests = [
    # coloring mismatch in fixture
    "test_subparsers_usage"
  ]
  ++ lib.optionals (!python.isPy313) [
    # solid vs dash line mismatch
    "test_rich_renderables"
  ];
+7 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
  python,

  # build-system
  poetry-core,
@@ -27,14 +28,18 @@

buildPythonPackage rec {
  pname = "rich";
  version = "14.3.3";
  version = if python.isPy313 then "14.2.0" else "14.3.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Textualize";
    repo = "rich";
    tag = "v${version}";
    hash = "sha256-6udVO7N17ineQozlCG/tI9jJob811gqb4GtY50JZFb0=";
    hash =
      if python.isPy313 then
        "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8="
      else
        "sha256-6udVO7N17ineQozlCG/tI9jJob811gqb4GtY50JZFb0=";
  };

  build-system = [ poetry-core ];