Merge pull request #284695 from dotlambda/colorlog-6.8.2 (cbb9f291) · Commits · nix / nixpkgs

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

+13 −14

Original line number	Diff line number	Diff line
		@@ -2,10 +2,8 @@
		, attrs
		, buildPythonPackage
		, colorlog
		, csvw
		, fetchFromGitHub
		, git
		, isPy27
		, lxml
		, markdown
		, markupsafe
		@@ -15,30 +13,36 @@
		, pytest-mock
		, pytestCheckHook
		, python-dateutil
		, pythonOlder
		, setuptools
		, tabulate
		}:

		buildPythonPackage rec {
		pname = "clldutils";
		version = "3.19.0";
		format = "setuptools";
		disabled = isPy27;
		version = "3.21.0";
		pyproject = true;
		disabled = pythonOlder "3.8";

		src = fetchFromGitHub {
		owner = "clld";
		repo = pname;
		rev = "v${version}";
		hash = "sha256-dva0lbbTxvETDPkACxpI3PPzWh5gz87Fv6W3lTjNv3Q=";
		hash = "sha256-OD+WJ9JuYZb/oXDgVqL4i5YlcVEt0+swq0SB3cutyRo=";
		};

		patchPhase = ''
		substituteInPlace setup.cfg --replace "--cov" ""
		substituteInPlace setup.cfg \
		--replace-fail "--cov" ""
		'';

		nativeBuildInputs = [
		setuptools
		];

		propagatedBuildInputs = [
		attrs
		colorlog
		csvw
		lxml
		markdown
		markupsafe
		@@ -55,13 +59,8 @@ buildPythonPackage rec {
		git
		];

		disabledTests = [
		# uses pytest.approx which is not supported in a boolean context in pytest7
		"test_to_dec"
		"test_roundtrip"
		];

		meta = with lib; {
		changelog = "https://github.com/clld/clldutils/blob/${src.rev}/CHANGES.md";
		description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al";
		homepage = "https://github.com/clld/clldutils";
		license = licenses.asl20;

+2 −2

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

		buildPythonPackage rec {
		pname = "colorlog";
		version = "6.8.0";
		version = "6.8.2";
		pyproject = true;

		src = fetchPypi {
		inherit pname version;
		hash = "sha256-+7b9+dVoXyUX84j7Kbsn1U6GVN0x9YvCo7IX6WepXKY=";
		hash = "sha256-Pj4HmkH+taG2T5eLXqT0YECpTxHw6Lu4Jh49u+ymTUQ=";
		};

		nativeBuildInputs = [