diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix index d1f9fdd4209c..6ef4d2494502 100644 --- a/pkgs/development/python-modules/dipy/default.nix +++ b/pkgs/development/python-modules/dipy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + meson-python, packaging, cython, numpy, @@ -10,33 +11,43 @@ h5py, nibabel, tqdm, + trx-python, }: buildPythonPackage rec { pname = "dipy"; - version = "1.7.0"; - format = "setuptools"; + version = "1.9.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dipy"; - repo = pname; + repo = "dipy"; rev = "refs/tags/${version}"; - hash = "sha256-sfqCK2r9Io1gDDHL9s9R37J0h9KcOQML3B2zJx2+QuA="; + hash = "sha256-6cpxuk2PL43kjQ+6UGiUHUXC7pC9OlW9kZvGOdEXyzw="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy==" "numpy>=" + ''; + + build-system = [ cython + meson-python + numpy packaging ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy h5py nibabel + packaging tqdm + trx-python ]; # disable tests for now due to: @@ -53,7 +64,6 @@ buildPythonPackage rec { "dipy.reconst" "dipy.io" "dipy.viz" - "dipy.boots" "dipy.data" "dipy.utils" "dipy.segment" diff --git a/pkgs/development/python-modules/trx-python/default.nix b/pkgs/development/python-modules/trx-python/default.nix new file mode 100644 index 000000000000..556cf6118ec9 --- /dev/null +++ b/pkgs/development/python-modules/trx-python/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + setuptools, + setuptools-scm, + deepdiff, + nibabel, + numpy, + pytestCheckHook, + psutil, +}: + +buildPythonPackage rec { + pname = "trx-python"; + version = "0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tee-ar-ex"; + repo = "trx-python"; + rev = "refs/tags/${version}"; + hash = "sha256-gKPgP3GJ7QY0Piylk5L0HxnscRCREP1Hm5HZufL2h5g="; + }; + + build-system = [ + cython + setuptools + setuptools-scm + ]; + + dependencies = [ + deepdiff + nibabel + numpy + ]; + + pythonImportsCheck = [ "trx" ]; + + nativeCheckInputs = [ + pytestCheckHook + psutil + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + pytestFlagsArray = [ "trx/tests" ]; + + disabledTestPaths = [ + # access to network + "trx/tests/test_memmap.py" + "trx/tests/test_io.py" + ]; + + meta = { + description = "Python implementation of the TRX file format"; + homepage = "https://github.com/tee-ar-ex/trx-python"; + changelog = "https://github.com/tee-ar-ex/trx-python/releases/tag/${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23e45510b182..dc91b6d0b25e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16116,6 +16116,8 @@ self: super: with self; { truststore = callPackage ../development/python-modules/truststore { }; + trx-python = callPackage ../development/python-modules/trx-python { }; + trytond = callPackage ../development/python-modules/trytond { }; ts1-signatures = callPackage ../development/python-modules/ts1-signatures { };