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

Merge #326371: Revert "mypy: 1.10.0 → 1.10.1" 

Unexplained large rebuild. Moving to staging.
parents b0407f15 fbcc06d6

pkgs/applications/science/misc/cwltool/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ python3.pkgs.buildPythonApplication rec { 
      --replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \

      --replace "PYTEST_RUNNER + " ""

    substituteInPlace pyproject.toml \

      --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \

      --replace "mypy==1.10.0" "mypy==1.10.*"

      --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml"

  '';



  nativeBuildInputs = [

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

+2 −6
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  stdenv,

  buildPythonPackage,

  fetchFromGitHub,

  gitUpdater,

  pythonAtLeast,

  pythonOlder,
@@ -32,7 +31,7 @@ 


buildPythonPackage rec {

  pname = "mypy";

  version = "1.10.1";

  version = "1.10.0";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -41,10 +40,7 @@ buildPythonPackage rec { 
    owner = "python";

    repo = "mypy";

    rev = "refs/tags/v${version}";

    hash = "sha256-joV+elRaAICNQHkYuYtTDjvOUkHPsRkG1OLRvdxeIHc=";

  };

  passthru.updateScript = gitUpdater {

    rev-prefix = "v";

    hash = "sha256-NCnc4C/YFKHN/kT7RTFCYs/yC00Kt1E7mWCoQuUjxG8=";

  };



  build-system = [

pkgs/development/python-modules/schema-salad/default.nix

+0 −6
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
  buildPythonPackage,

  cachecontrol,

  fetchFromGitHub,

  fetchpatch,

  importlib-resources,

  mistune,

  mypy,
@@ -57,11 +56,6 @@ buildPythonPackage rec { 
    ++ cachecontrol.optional-dependencies.filecache

    ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];



  patches = [ (fetchpatch {

    url = "https://patch-diff.githubusercontent.com/raw/common-workflow-language/schema_salad/pull/840.patch";

    hash = "sha256-fke75FCCn23LAMJ5bDWJpuBR6E9XIpjmzzXSbjqpxn8=";

  } ) ];



  nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen;



  preCheck = ''