Skip to content

python310Packages.cachecontrol: 0.12.11 -> 0.13.1, pip-audit: 2.5.6 -> 2.6.0 #241227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
domenkozar merged 2 commits into from
Jul 6, 2023
Merged

python310Packages.cachecontrol: 0.12.11 -> 0.13.1, pip-audit: 2.5.6 -> 2.6.0 #241227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
144afdd
python310Packages.cachecontrol: 0.12.11 -> 0.13.1
fabaff Jul 3, 2023
61301ff
pip-audit: 2.5.6 -> 2.6.0
fabaff Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions pkgs/development/python-modules/cachecontrol/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
, buildPythonPackage
, cherrypy
, fetchFromGitHub
, lockfile
, flit-core
, filelock
, mock
, msgpack
, pytestCheckHook
Expand All @@ -13,8 +14,8 @@

buildPythonPackage rec {
pname = "cachecontrol";
version = "0.12.11";
format = "setuptools";
version = "0.13.1";
format = "pyproject";

disabled = pythonOlder "3.6";

Expand All @@ -23,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "ionrock";
repo = pname;
rev = "v${version}";
hash = "sha256-uUPIQz/n347Q9G7NDOGuB760B/KxOglUxiS/rYjt5Po=";
rev = "refs/tags/v${version}";
hash = "sha256-4N+vk65WxOrT+IJRn+lEnbs5vlWQh9ievVHWWe3BKJ0=";
};

postPatch = ''
Expand All @@ -34,29 +35,39 @@ buildPythonPackage rec {
"urllib3.response.HTTPResponse.from_httplib"
'';

nativeBuildInputs = [
flit-core
];

propagatedBuildInputs = [
msgpack
requests
];

passthru.optional-dependencies = {
filecache = [
filelock
];
redis = [
redis
];
};

nativeCheckInputs = [
cherrypy
mock
pytestCheckHook
] ++ passthru.optional-dependencies.filecache;
requests
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);

pythonImportsCheck = [
"cachecontrol"
];

passthru.optional-dependencies = {
filecache = [ lockfile ];
redis = [ redis ];
};

meta = with lib; {
description = "Httplib2 caching for requests";
homepage = "https://github.com/ionrock/cachecontrol";
changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
};
Expand Down
29 changes: 6 additions & 23 deletions pkgs/development/tools/pip-audit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,24 @@
, fetchFromGitHub
, python3
}:
let
py = python3.override {
packageOverrides = self: super: {

cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec {
version = "2.7.1";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-python-lib";
rev = "v${version}";
hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk=";
};
});
};
};
in
with py.pkgs;

buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "pip-audit";
version = "2.5.6";
version = "2.6.0";
format = "pyproject";

src = fetchFromGitHub {
owner = "trailofbits";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-hpzJtKtvhudT7OzZnuv6LbnMHnHIBYmQsAR1oRglvT0=";
hash = "sha256-Ja3LPKfrqs1evNzjOJ3oxh2vxqw8oZJDIsyZGT0q3PY=";
};

nativeBuildInputs = [
nativeBuildInputs = with python3.pkgs; [
flit-core
];

propagatedBuildInputs = [
propagatedBuildInputs = with python3.pkgs; [
cachecontrol
cyclonedx-python-lib
html5lib
Expand All @@ -47,7 +30,7 @@ buildPythonApplication rec {
toml
] ++ cachecontrol.optional-dependencies.filecache;

nativeCheckInputs = [
nativeCheckInputs = with python3.pkgs; [
pretend
pytestCheckHook
];
Expand Down