From fb9bec6beda03abf2a8f86ae0abe9a42e750ae9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 19 Aug 2022 21:06:07 +0200 Subject: [PATCH 1/2] python310Packages.jsonlines: 3.0.0 -> 3.1.0 --- .../python-modules/jsonlines/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index 73e7d308ec4a..86f5e08d126d 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -1,23 +1,24 @@ -{ lib, fetchFromGitHub, buildPythonPackage, six -, flake8, pep8-naming, pytest, pytest-cov }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, attrs +, pytestCheckHook +}: buildPythonPackage rec { pname = "jsonlines"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "wbolster"; repo = pname; rev = version; - sha256 = "1242bvk208vjaw8zl1d7ydb0i05v8fwdgi92d3bi1vaji9s2hv65"; + sha256 = "sha256-eMpUk5s49OyD+cNGdAeKA2LvpXdKta2QjZIFDnIBKC8="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ attrs ]; - checkInputs = [ flake8 pep8-naming pytest pytest-cov ]; - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python library to simplify working with jsonlines and ndjson data"; From fcc4037cc813722da520df1091b82883778febef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Aug 2022 16:46:36 +0200 Subject: [PATCH 2/2] python310Packages.jsonlines: add pythonImportsCheck --- .../python-modules/jsonlines/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index 86f5e08d126d..a111d3ef6d04 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -1,29 +1,41 @@ { lib +, attrs , fetchFromGitHub , buildPythonPackage -, attrs , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "jsonlines"; version = "3.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "wbolster"; repo = pname; rev = version; - sha256 = "sha256-eMpUk5s49OyD+cNGdAeKA2LvpXdKta2QjZIFDnIBKC8="; + hash = "sha256-eMpUk5s49OyD+cNGdAeKA2LvpXdKta2QjZIFDnIBKC8="; }; - propagatedBuildInputs = [ attrs ]; + propagatedBuildInputs = [ + attrs + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jsonlines" + ]; meta = with lib; { description = "Python library to simplify working with jsonlines and ndjson data"; homepage = "https://github.com/wbolster/jsonlines"; - maintainers = with maintainers; [ ]; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; }