From c2df575c6c8a0dc15d5474a197480d47a01d50b2 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 25 Feb 2021 20:51:23 -0500 Subject: [PATCH 1/3] pythonPackages.exdown: 0.7.1 -> 0.8.5 --- pkgs/development/python-modules/exdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index 17cab3fe55f..bf0a71984c5 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "exdown"; - version = "0.7.1"; + version = "0.8.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vnSso3vmPIjX7JX+NwoxguwqwPHocJACeh5H0ClPcUI="; + sha256 = "1ly67whyfn74nr0dncarf3xbd96hacvzgjihx4ibckkc4h9z46bj"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; From ed626755b21e2a20e38e1373ae65b0e3cc3bcffb Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 25 Feb 2021 21:02:38 -0500 Subject: [PATCH 2/3] pythonPackages.meshio: init at 4.3.10 --- .../python-modules/meshio/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/meshio/default.nix diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix new file mode 100644 index 00000000000..2c293b3b9c2 --- /dev/null +++ b/pkgs/development/python-modules/meshio/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, netcdf4 +, h5py +, exdown +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "meshio"; + version = "4.3.10"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "1i34bk8bbc0dnizrlgj0yxnbzyvndkmnl6ryymxgcl9rv1abkfki"; + }; + + propagatedBuildInputs = [ + numpy + netcdf4 + h5py + ]; + + checkInputs = [ + exdown + pytestCheckHook + ]; + + pythonImportsCheck = ["meshio"]; + + meta = with lib; { + homepage = "https://github.com/nschloe/meshio"; + description = "I/O for mesh files."; + license = licenses.mit; + maintainers = with maintainers; [ wd15 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7270853d84e..b7aa6d81a60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4058,6 +4058,8 @@ in { mesa = callPackage ../development/python-modules/mesa { }; + meshio = callPackage ../development/python-modules/meshio { }; + meshlabxml = callPackage ../development/python-modules/meshlabxml { }; meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs From 28360094d87a15cfe9ef67c51380713a9bafec47 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 25 Feb 2021 21:08:32 -0500 Subject: [PATCH 3/3] pythonPackages.sfepy: 2019.4 -> 2020.4 --- .../python-modules/sfepy/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 8a37f41086e..dacd589b121 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -9,15 +9,21 @@ , cython , python , sympy +, meshio +, mpi4py +, psutil +, openssh +, pythonOlder }: buildPythonPackage rec { - name = "sfepy_${version}"; - version = "2019.4"; + name = "sfepy"; + version = "2020.4"; + disabled = pythonOlder "3.8"; src = fetchurl { url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz"; - sha256 = "1l9vgcw09l6bwhgfzlbn68fzpvns25r6nkd1pcp7hz5165hs6zzn"; + sha256 = "1wb0ik6kjg3mksxin0abr88bhsly67fpg36qjdzabhj0xn7j1yaz"; }; propagatedBuildInputs = [ @@ -28,12 +34,15 @@ buildPythonPackage rec { pyparsing tables sympy + meshio + mpi4py + psutil + openssh ]; postPatch = '' - # broken test - rm tests/test_homogenization_perfusion.py - rm tests/test_splinebox.py + # broken tests + rm tests/test_meshio.py # slow tests rm tests/test_input_*.py @@ -47,6 +56,7 @@ buildPythonPackage rec { ''; checkPhase = '' + export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh export HOME=$TMPDIR mv sfepy sfepy.hidden mkdir -p $HOME/.matplotlib