Merge pull request #141089 from fabaff/bump-commoncode (5a8952d2) · Commits · nix / nixpkgs

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

+19 −12

Original line number	Diff line number	Diff line
		{ lib
		, fetchPypi
		, attrs
		, beautifulsoup4
		, buildPythonPackage
		, setuptools-scm
		, click
		, requests
		, attrs
		, fetchPypi
		, intbitset
		, pytest-xdist
		, pytestCheckHook
		, pythonOlder
		, requests
		, saneyaml
		, setuptools-scm
		, text-unidecode
		, beautifulsoup4
		, pytestCheckHook
		, pytest-xdist
		, typing
		}:

		buildPythonPackage rec {
		pname = "commoncode";
		version = "21.8.31";
		version = "30.0.0";

		disabled = pythonOlder "3.6";

		src = fetchPypi {
		inherit pname version;
		sha256 = "0e74c61226834393801e921ab125eae3b52361340278fb9a468c5c691d286c32";
		sha256 = "sha256-6SeU4u6pfDuGCgCYAO5fdbWBxW9XN3WvM8j6DwUlFwM=";
		};

		dontConfigure = true;
		@@ -28,13 +33,15 @@ buildPythonPackage rec {
		];

		propagatedBuildInputs = [
		click
		requests
		attrs
		beautifulsoup4
		click
		intbitset
		requests
		saneyaml
		text-unidecode
		beautifulsoup4
		] ++ lib.optionals (pythonOlder "3.7") [
		typing
		];

		checkInputs = [

+2 −2

Original line number	Diff line number	Diff line
		@@ -11,12 +11,12 @@

		buildPythonPackage rec {
		pname = "debian-inspector";
		version = "21.5.25";
		version = "30.0.0";

		src = fetchPypi {
		pname = "debian_inspector";
		inherit version;
		sha256 = "1d3xaqw00kav85nk29qm2yqb73bkyqf185fs1q0vgd7bnap9wqaw";
		sha256 = "sha256-0PT5sT6adaqgYQtWjks12ys0z1C3n116aeJaEKR/Wxg=";
		};

		nativeBuildInputs = [

+4 −2

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		, pytestCheckHook
		, pytest-xdist
		}:

		buildPythonPackage rec {
		pname = "extractcode";
		version = "21.7.23";
		@@ -36,7 +37,7 @@ buildPythonPackage rec {
		pytest-xdist
		];

		# cli test tests the cli which we can't do until after install
		# CLI test tests the cli which we can't do until after install
		disabledTestPaths = [
		"tests/test_extractcode_cli.py"
		];
		@@ -45,6 +46,7 @@ buildPythonPackage rec {
		disabledTests = [
		"test_uncompress_lz4_basic"
		"test_extract_tarlz4_basic"
		"test_extract_rar_with_trailing_data"
		# tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox
		"test_can_extract_qcow2_vm_image_as_tarball"
		"test_can_extract_qcow2_vm_image_not_as_tarball"
		@@ -56,7 +58,7 @@ buildPythonPackage rec {
		];

		meta = with lib; {
		description = "A mostly universal archive extractor using z7zip, libarchve, other libraries and the Python standard library for reliable archive extraction";
		description = "Universal archive extractor using z7zip, libarchve, other libraries and the Python standard library";
		homepage = "https://github.com/nexB/extractcode";
		license = licenses.asl20;
		maintainers = teams.determinatesystems.members;

+27 −7

Original line number	Diff line number	Diff line
		{ lib, buildPythonPackage, fetchFromGitHub
		{ lib
		, boolean-py
		, buildPythonPackage
		, fetchFromGitHub
		, pytestCheckHook
		, pythonOlder
		, setuptools-scm
		}:

		buildPythonPackage rec {
		pname = "license-expression";
		version = "1.2";
		version = "21.6.14";

		disabled = pythonOlder "3.6";

		src = fetchFromGitHub {
		owner = "nexB";
		repo = "license-expression";
		rev = "v${version}";
		sha256 = "0bbd7d90z58p9sd01b00g0vfd9bmwzksjb7pc8833s2jpja9mxz1";
		sha256 = "sha256-hwfYKKalo8WYFwPCsRRXNz+/F8/42PXA8jxbIQjJH/g=";
		};
		postPatch = "patchShebangs ./configure";

		propagatedBuildInputs = [ boolean-py ];
		dontConfigure = true;

		nativeBuildInputs = [
		setuptools-scm
		];

		propagatedBuildInputs = [
		boolean-py
		];

		checkInputs = [
		pytestCheckHook
		];

		pythonImportsCheck = [ "license_expression" ];

		meta = with lib; {
		description = "Utility library to parse, normalize and compare License expressions for Python";
		homepage = "https://github.com/nexB/license-expression";
		description = "Utility library to parse, normalize and compare License expressions for Python using a boolean logic engine";
		license = licenses.asl20;
		maintainers = with maintainers; [ fab ];
		};

		}

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonPackage
		, fetchPypi
		, pytestCheckHook
		, pythonOlder
		}:

		buildPythonPackage rec {
		pname = "parameter-expansion-patched";
		version = "0.2.1b4";

		disabled = pythonOlder "3.6";

		src = fetchPypi {
		inherit pname version;
		sha256 = "1vhshscjifi78qapzwn29gln6p8jhyc7cccszl8ai2jamhcph5zs";
		};

		checkInputs = [
		pytestCheckHook
		];

		pythonImportsCheck = [
		"parameter_expansion"
		];

		meta = with lib; {
		description = "POSIX parameter expansion in Python";
		homepage = "https://github.com/nexB/commoncode";
		license = licenses.asl20;
		maintainers = with maintainers; [ fab ];
		};
		}