Unverified Commit 6b22c496 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

python3Packages.requests-ratelimiter: unbreak (#497999)

parents 77794302 84c66f54

pkgs/by-name/co/conkeyscan/package.nix

+7 −18
Original line number Diff line number Diff line
@@ -4,18 +4,7 @@ 
  fetchFromGitHub,

  fetchpatch,

}:



let

  python = python3.override {

    self = python3;

    packageOverrides = self: super: {

      pyrate-limiter = super.pyrate-limiter_2;

    };

  };



in



python.pkgs.buildPythonApplication rec {

python3.pkgs.buildPythonApplication (finalAttrs: {

  pname = "conkeyscan";

  version = "1.1.0";

  pyproject = true;
@@ -23,7 +12,7 @@ python.pkgs.buildPythonApplication rec { 
  src = fetchFromGitHub {

    owner = "CompassSecurity";

    repo = "conkeyscan";

    tag = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-xYCms+Su7FmaG7KVHZpzfD/wx9Gepz11t8dEK/YDfvI=";

  };
@@ -38,12 +27,12 @@ python.pkgs.buildPythonApplication rec { 


  postPatch = ''

    substituteInPlace setup.py \

      --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}"

      --replace-fail "{{VERSION_PLACEHOLDER}}" "${finalAttrs.version}"

  '';



  build-system = with python.pkgs; [ setuptools ];

  build-system = with python3.pkgs; [ setuptools ];



  dependencies = with python.pkgs; [

  dependencies = with python3.pkgs; [

    atlassian-python-api

    beautifulsoup4

    clize
@@ -62,9 +51,9 @@ python.pkgs.buildPythonApplication rec { 
  meta = {

    description = "Tool to scan Confluence for keywords";

    homepage = "https://github.com/CompassSecurity/conkeyscan";

    changelog = "https://github.com/CompassSecurity/conkeyscan/releases/tag/v${version}";

    changelog = "https://github.com/CompassSecurity/conkeyscan/releases/tag/${finalAttrs.src.tag}";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ fab ];

    mainProgram = "conkeyscan";

  };

}
 
})

pkgs/by-name/sb/sbomnix/package.nix

+6 −17
Original line number Diff line number Diff line
@@ -8,18 +8,7 @@ 
  python3,

  vulnix,

}:



let

  python = python3.override {

    self = python3;

    packageOverrides = self: super: {

      pyrate-limiter = super.pyrate-limiter_2;

    };

  };



in



python.pkgs.buildPythonApplication rec {

python3.pkgs.buildPythonApplication (finalAttrs: {

  pname = "sbomnix";

  version = "1.7.4";

  pyproject = true;
@@ -27,7 +16,7 @@ python.pkgs.buildPythonApplication rec { 
  src = fetchFromGitHub {

    owner = "tiiuae";

    repo = "sbomnix";

    tag = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-s7mmtbELRcl/7ab5A3fU7f8m4rIm+mBLmXMeYHa7/n4=";



    # Remove documentation as it contains references to nix store
@@ -42,7 +31,7 @@ python.pkgs.buildPythonApplication rec { 
      lib.makeBinPath [

        git

        nix

        python.pkgs.graphviz

        python3.pkgs.graphviz

        nix-visualize

        vulnix

        grype
@@ -50,9 +39,9 @@ python.pkgs.buildPythonApplication rec { 
    }"

  ];



  build-system = [ python.pkgs.setuptools ];

  build-system = [ python3.pkgs.setuptools ];



  dependencies = with python.pkgs; [

  dependencies = with python3.pkgs; [

    beautifulsoup4

    colorlog

    dfdiskcache
@@ -89,4 +78,4 @@ python.pkgs.buildPythonApplication rec { 
    ];

    mainProgram = "sbomnix";

  };

}
 
})

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

+23 −5
Original line number Diff line number Diff line
@@ -6,20 +6,20 @@ 
  fetchPypi,

  od,

  pygments,

  pythonAtLeast,

  python-dateutil,

  repeated-test,

  setuptools-scm,

  sigtools,

  unittestCheckHook,

}:



buildPythonPackage rec {

buildPythonPackage (finalAttrs: {

  pname = "clize";

  version = "5.0.2";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    inherit (finalAttrs) pname version;

    hash = "sha256-BH9aRHNgJxirG4VnKn4VMDOHF41agcJ13EKd+sHstRA=";

  };
@@ -43,13 +43,31 @@ buildPythonPackage rec { 
    repeated-test

  ];



  unittestFlags =

    let

      disabledTests = [

        "test_help.ElementsFromAutodetectedDocstringTests.test_sphinx_has_sphinx_error_in_param_desc"

        "test_help.ElementsFromAutodetectedDocstringTests.test_sphinx_has_sphinx_error_in_free_text"

        "test_help.ElementsFromAutodetectedDocstringTests.test_clize_sphinx_error"

        "test_help.ElementsFromAutodetectedDocstringTests.test_clize_has_sphinx_error"

      ]

      ++ lib.optionals (pythonAtLeast "3.14") [

        "test_help.ClizeWholeHelpTests.test_custom_param_help"

      ];

      matchingPattern = builtins.concatStringsSep "|" disabledTests;

    in

    [

      "-s clize/tests"

      "-k [!(${matchingPattern})]"

    ];



  pythonImportsCheck = [ "clize" ];



  meta = {

    description = "Command-line argument parsing for Python";

    homepage = "https://github.com/epsy/clize";

    changelog = "https://github.com/epsy/clize/releases/tag/v${version}";

    changelog = "https://github.com/epsy/clize/releases/tag/v${finalAttrs.version}";

    license = lib.licenses.mit;

    maintainers = [ ];

  };

}
 
})

pkgs/development/python-modules/requests-ratelimiter/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ buildPythonPackage (finalAttrs: { 
  pythonImportsCheck = [ "requests_ratelimiter" ];



  meta = {

    # https://github.com/JWCook/requests-ratelimiter/issues/78

    broken = lib.versionOlder pyrate-limiter.version "4";

    description = "Module for rate-limiting for requests";

    homepage = "https://github.com/JWCook/requests-ratelimiter";

    changelog = "https://github.com/JWCook/requests-ratelimiter/blob/${finalAttrs.src.tag}/HISTORY.md";