Merge pull request #240782 from fabaff/decli-bump (cc466d1a) · Commits · nix / nixpkgs

pkgs/applications/version-management/commitizen/default.nix

+29 −49

Original line number	Diff line number	Diff line
		{ buildPythonApplication
		, charset-normalizer
		, colorama
		{ lib
		, commitizen
		, decli
		, fetchFromGitHub
		, git
		, jinja2
		, lib
		, packaging
		, poetry-core
		, py
		, pytest-freezer
		, pytest-mock
		, pytest-regressions
		, pytestCheckHook
		, pyyaml
		, questionary
		, termcolor
		, python3
		, testers
		, tomlkit
		, typing-extensions
		, argcomplete
		, nix-update-script
		, pre-commit
		}:

		buildPythonApplication rec {
		python3.pkgs.buildPythonApplication rec {
		pname = "commitizen";
		version = "2.42.1";
		version = "3.5.2";
		format = "pyproject";

		src = fetchFromGitHub {
		owner = "commitizen-tools";
		repo = pname;
		rev = "v${version}";
		hash = "sha256-lrZfMqmslwx3B2WkvFosm3EmCHgpZEA/fOzR6UYf6f8=";
		rev = "refs/tags/v${version}";
		hash = "sha256-4m3NCnGUX9lHCk6czwzxXLqf8GLi2u2A/crBZYTyplA=";
		};

		format = "pyproject";

		nativeBuildInputs = [ poetry-core ];
		pythonRelaxDeps = [
		"decli"
		];

		postPatch = ''
		substituteInPlace pyproject.toml \
		--replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' \
		--replace 'argcomplete = ">=1.12.1,<2.1"' 'argcomplete = ">=1.12.1"'
		'';
		nativeBuildInputs = with python3.pkgs; [
		poetry-core
		pythonRelaxDepsHook
		];

		propagatedBuildInputs = [
		propagatedBuildInputs = with python3.pkgs; [
		argcomplete
		charset-normalizer
		termcolor
		questionary
		colorama
		decli
		tomlkit
		importlib-metadata
		jinja2
		pyyaml
		argcomplete
		typing-extensions
		packaging
		pyyaml
		questionary
		termcolor
		tomlkit
		];

		doCheck = true;

		nativeCheckInputs = [
		pre-commit
		nativeCheckInputs = with python3.pkgs; [
		argcomplete
		deprecated
		git
		py
		pytestCheckHook
		pytest-freezer
		pytest-mock
		pytest-regressions
		argcomplete
		git
		pytestCheckHook
		];

		# the tests require a functional git installation
		doCheck = true;

		# The tests require a functional git installation
		# which requires a valid HOME directory.
		preCheck = ''
		export HOME="$(mktemp -d)"
		@@ -101,7 +82,6 @@ buildPythonApplication rec {
		package = commitizen;
		command = "cz version";
		};
		updateScript = nix-update-script { };
		};

		meta = with lib; {

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

+27 −8

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

		buildPythonPackage rec {
		pname = "decli";
		version = "0.5.2";
		version = "0.6.1";
		format = "pyproject";

		src = fetchPypi {
		inherit pname version;
		hash = "sha256-8s3lUDSnXIGcYwx2VahExhLyWYxCwhKZFgRl32rUY60=";
		disabled = pythonOlder "3.7";

		src = fetchFromGitHub {
		owner = "woile";
		repo = pname;
		rev = "refs/tags/v${version}";
		hash = "sha256-FZYKNKkQExx/YBn5y/W0+0aMlenuwEctYTL7LAXMZGE=";
		};

		pythonImportsCheck = [ "decli" ];
		nativeBuildInputs = [
		setuptools
		];

		nativeCheckInputs = [
		pytestCheckHook
		];

		pythonImportsCheck = [
		"decli"
		];

		meta = with lib; {
		description = "Minimal, easy to use, declarative command line interface tool";
		homepage = "https://github.com/Woile/decli";
		changelog = "https://github.com/woile/decli/blob/v${version}/CHANGELOG.md";
		license = licenses.mit;
		maintainers = with maintainers; [ lovesegfault ];
		};

pkgs/top-level/all-packages.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -4414,7 +4414,7 @@ with pkgs;

		comma = callPackage ../tools/package-management/comma { };

		commitizen = python3Packages.callPackage ../applications/version-management/commitizen { };
		commitizen = callPackage ../applications/version-management/commitizen { };

		common-licenses = callPackage ../data/misc/common-licenses { };