From 3095200a3efae7967df0bc331e4df1112df3d325 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Apr 2023 02:03:45 +0000 Subject: [PATCH 1/4] python310Packages.pygmt: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/pygmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 6ef799c997b0..a0bea1e31413 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "refs/tags/v${version}"; - hash = "sha256-wbqJaibRZW7qiNyLArr7I/dzHprILHQpORtdHWkIfSE="; + hash = "sha256-XDIAFIU+chewMDEoQDYqSYvK1tT9afh44w3Yd7ILZIc="; }; postPatch = '' From 3ac2acfe88c35d9b063b400f5114af0d136b06ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Apr 2023 08:55:33 +0200 Subject: [PATCH 2/4] python310Packages.pygmt: add changelog to meta --- pkgs/development/python-modules/pygmt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index a0bea1e31413..fb910a9a6472 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { description = "A Python interface for the Generic Mapping Tools"; homepage = "https://github.com/GenericMappingTools/pygmt"; license = licenses.bsd3; + changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; # pygmt.exceptions.GMTCLibNotFoundError: Error loading the GMT shared library '/nix/store/r3xnnqgl89vrnq0kzxx0bmjwzks45mz8-gmt-6.1.1/lib/libgmt.dylib' broken = stdenv.isDarwin; maintainers = with maintainers; [ sikmir ]; From 4fc52a4ab92bd25dba2ea0fa26a0974fc91bcd06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Apr 2023 08:55:57 +0200 Subject: [PATCH 3/4] python310Packages.pygmt: update disabled --- pkgs/development/python-modules/pygmt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index fb910a9a6472..63ed4eb038c9 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = "0.9.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "GenericMappingTools"; From 92376558f6837bd05834bfdaaa747574c3c99069 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Apr 2023 08:58:41 +0200 Subject: [PATCH 4/4] python310Packages.pygmt: equalize --- .../python-modules/pygmt/default.nix | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 63ed4eb038c9..a6e4c9a613aa 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , pythonOlder , buildPythonPackage , fetchFromGitHub @@ -34,15 +35,35 @@ buildPythonPackage rec { --replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")" ''; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ numpy netcdf4 pandas packaging xarray ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + numpy + netcdf4 + pandas + packaging + xarray + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mpl + ghostscript + ipython + ]; + + # The *entire* test suite requires network access + doCheck = false; - doCheck = false; # the *entire* test suite requires network access - nativeCheckInputs = [ pytestCheckHook pytest-mpl ghostscript ipython ]; postBuild = '' export HOME=$TMP ''; - pythonImportsCheck = [ "pygmt" ]; + + pythonImportsCheck = [ + "pygmt" + ]; meta = with lib; { description = "A Python interface for the Generic Mapping Tools";