From 7c4a19b2ee6e4b860bdb710abe5bdfbc5814d269 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 17 Jun 2020 09:40:07 -0700 Subject: [PATCH 1/5] pythonPackages.colorful: init at 0.5.4 Co-Authored-By: Chris --- .../python-modules/colorful/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/colorful/default.nix diff --git a/pkgs/development/python-modules/colorful/default.nix b/pkgs/development/python-modules/colorful/default.nix new file mode 100644 index 00000000000..c9378e329a3 --- /dev/null +++ b/pkgs/development/python-modules/colorful/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "colorful"; + version = "0.5.4"; + + # No tests in the Pypi package. + src = fetchFromGitHub { + owner = "timofurrer"; + repo = pname; + rev = "v${version}"; + sha256 = "1fcz5v8b318a3dsdha4c874jsf3wmcw3f25bv2csixclyzacli98"; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Terminal string styling done right, in Python."; + homepage = "http://github.com/timofurrer/colorful"; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 83672a227ed..24240d3a904 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2084,6 +2084,8 @@ in { colorclass = callPackage ../development/python-modules/colorclass {}; + colorful = callPackage ../development/python-modules/colorful {}; + colorlog = callPackage ../development/python-modules/colorlog { }; colorspacious = callPackage ../development/python-modules/colorspacious { }; From 86f9646cb8acb54588f0fc3c1858ad5cdf8b03cc Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 17 Jun 2020 09:42:36 -0700 Subject: [PATCH 2/5] pythonPackages.pysingleton: init at 0.2.1 Co-Authored-By: Chris --- .../python-modules/pysingleton/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/pysingleton/default.nix diff --git a/pkgs/development/python-modules/pysingleton/default.nix b/pkgs/development/python-modules/pysingleton/default.nix new file mode 100644 index 00000000000..22e4ade4a88 --- /dev/null +++ b/pkgs/development/python-modules/pysingleton/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pysingleton"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "5776e7a4ba0bab26709da604f4e648c5814385fef34010723db3da0d41b0dbcc"; + }; + + pythonImportsCheck = [ "singleton" ]; + + # No tests in the Pypi package. + doCheck = false; + + meta = with lib; { + description = "Provides a decorator to create thread-safe singleton classes"; + homepage = "https://github.com/timofurrer/pysingleton"; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24240d3a904..9bf847e2ed3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2536,6 +2536,8 @@ in { PyLD = callPackage ../development/python-modules/PyLD { }; + pysingleton = callPackage ../development/python-modules/pysingleton { }; + python-jose = callPackage ../development/python-modules/python-jose {}; python-json-logger = callPackage ../development/python-modules/python-json-logger { }; From d4dae82872962daa917b6ad865218d9bff7f31eb Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 17 Jun 2020 09:45:45 -0700 Subject: [PATCH 3/5] pythonPackages.tag-expressions: init at 1.1.0 Co-Authored-By: Chris --- .../tag-expressions/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/tag-expressions/default.nix diff --git a/pkgs/development/python-modules/tag-expressions/default.nix b/pkgs/development/python-modules/tag-expressions/default.nix new file mode 100644 index 00000000000..7082ca54154 --- /dev/null +++ b/pkgs/development/python-modules/tag-expressions/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tag-expressions"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c0a49c3c0357976822b03c43db8d4a1c5548e16fb07ac939c10bbd5183f529d"; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Package to parse logical tag expressions"; + homepage = "http://github.com/timofurrer/tag-expressions"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9bf847e2ed3..0d21ccf249e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1639,6 +1639,8 @@ in { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; + tag-expressions = callPackage ../development/python-modules/tag-expressions { }; + tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; tesserocr = callPackage ../development/python-modules/tesserocr { }; From a1556613bc979a3009c9e5eb3b9fed93f50cc8d8 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 17 Jun 2020 09:44:21 -0700 Subject: [PATCH 4/5] pythonPackages.radish-bdd: init at 0.13.2 Co-Authored-By: Chris --- .../python-modules/radish-bdd/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/radish-bdd/default.nix diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix new file mode 100644 index 00000000000..b2d22346dd7 --- /dev/null +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, click +, colorful +, docopt +, fetchFromGitHub +, freezegun +, humanize +, lark-parser +, parse-type +, pysingleton +, pytestCheckHook +, pyyaml +, tag-expressions +, lxml +, pytest-mock +}: + +buildPythonPackage rec { + pname = "radish-bdd"; + version = "0.13.2"; + + # Pypi package does not have necessary test fixtures. + src = fetchFromGitHub { + owner = pname; + repo = "radish"; + rev = "v${version}"; + sha256 = "1k7l0j8w221pa6k990x4rfm7km4asx5zy4zpzvh029lb9nw2pp8b"; + }; + + propagatedBuildInputs = [ + lark-parser + click + colorful + tag-expressions + parse-type + humanize + pyyaml + docopt + pysingleton + ]; + + checkInputs = [ freezegun lxml pytestCheckHook pytest-mock ]; + disabledTests = [ "test_main_cli_calls" ]; + + meta = with lib; { + description = "Behaviour-Driven-Development tool for python"; + homepage = "http://radish-bdd.io"; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d21ccf249e..50222d095fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1500,6 +1500,8 @@ in { pyvoro = callPackage ../development/python-modules/pyvoro { }; + radish-bdd = callPackage ../development/python-modules/radish-bdd { }; + relatorio = callPackage ../development/python-modules/relatorio { }; reproject = callPackage ../development/python-modules/reproject { }; From 817a8355dc57e1c7fcae993d6ae21266e5cfd581 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 17 Jun 2020 10:00:13 -0700 Subject: [PATCH 5/5] terraform-compliance: init at 1.2.11 Co-Authored-By: Chris --- .../cluster/terraform-compliance/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform-compliance/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix new file mode 100644 index 00000000000..e906f035fda --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -0,0 +1,56 @@ +{ lib +, GitPython +, buildPythonApplication +, emoji +, fetchFromGitHub +, filetype +, ipython +, junit-xml +, lxml +, mock +, netaddr +, pytestCheckHook +, python3Packages +, radish-bdd +, semver +}: + +buildPythonApplication rec { + pname = "terraform-compliance"; + version = "1.2.11"; + + # No tests in Pypi package + src = fetchFromGitHub { + owner = "eerkunt"; + repo = pname; + rev = version; + sha256 = "161mszmxqp3wypnda48ama2mmq8yjilkxahwc1mxjwzy1n19sn7v"; + }; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_which_success" + "test_readable_plan_file_is_not_json" + ]; + + propagatedBuildInputs = [ + GitPython + emoji + filetype + ipython + junit-xml + lxml + mock + netaddr + radish-bdd + semver + ]; + + meta = with lib; { + description = "BDD test framework for terraform"; + homepage = https://github.com/eerkunt/terraform-compliance; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2551ddfde50..da6b9efa565 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26623,6 +26623,8 @@ in callPackage ../applications/networking/cluster/terraform-providers {} ); + terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance {}; + terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};