From 02901c1afb4a897a1fb1eedaeebe77ed380ee36d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 06:44:32 +0000 Subject: [PATCH 1/4] python312Packages.ratarmount: 0.15.1 -> 0.15.2 --- pkgs/development/python-modules/ratarmount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index 8e32579cb737..e084d5fc1a31 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ratarmount"; - version = "0.15.1"; + version = "0.15.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-hprXZGgE2fpg8Km3gWO60e7teUB4Age5skNPc4p+wIg="; + hash = "sha256-1JAj9vA/aZLDvZC7j5PD1OL9n4I0gag4Ezc0i68OQsw="; }; propagatedBuildInputs = [ From 8d8cd198031d02a5b3175e843784d983501d6cf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Sep 2024 09:22:51 +0200 Subject: [PATCH 2/4] python312Packages.ratarmountcore: 0.6.3 -> 0.7.2 Changelog: https://github.com/mxmlnkn/ratarmount/blob/core-v0.7.2/core/CHANGELOG.md --- .../python-modules/ratarmountcore/default.nix | 52 ++++++++++++------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix index eb97b7a4a64e..b966e0a319be 100644 --- a/pkgs/development/python-modules/ratarmountcore/default.nix +++ b/pkgs/development/python-modules/ratarmountcore/default.nix @@ -2,53 +2,61 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - pytestCheckHook, - indexed-bzip2, indexed-gzip, indexed-zstd, + libarchive-c, + pytestCheckHook, python-xz, - setuptools, + pythonOlder, rapidgzip, rarfile, + setuptools, zstandard, # Python bindings zstd, # System tool }: buildPythonPackage rec { pname = "ratarmountcore"; - version = "0.6.3"; + version = "0.7.2"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "mxmlnkn"; repo = "ratarmount"; rev = "core-v${version}"; - hash = "sha256-2jG066BUkhyHRqRyFAucQRJrjXQNw2ccCxERKkltO3Y="; + hash = "sha256-2LPGKdofx2ID8BU0dZhGiZ3tUkd+niEVGvTSBFX4InU="; fetchSubmodules = true; }; sourceRoot = "${src.name}/core"; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ - indexed-gzip - indexed-bzip2 - indexed-zstd - python-xz - rapidgzip - rarfile - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ "ratarmountcore" ]; + optional-dependencies = { + full = [ + indexed-gzip + indexed-zstd + python-xz + rapidgzip + rarfile + ]; + _7z = [ libarchive-c ]; + bzip2 = [ rapidgzip ]; + gzip = [ indexed-gzip ]; + rar = [ rarfile ]; + xz = [ python-xz ]; + zstd = [ indexed-zstd ]; + }; nativeCheckInputs = [ pytestCheckHook zstandard zstd - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "ratarmountcore" ]; disabledTestPaths = [ # Disable this test because for arcane reasons running pytest with nix-build uses 10-100x @@ -60,9 +68,17 @@ buildPythonPackage rec { "tests/test_BlockParallelReaders.py" ]; + disabledTests = [ + # Tests with issues + "test_file_versions" + "test_stream_compressed" + "test_chimera_file" + ]; + meta = with lib; { description = "Library for accessing archives by way of indexing"; homepage = "https://github.com/mxmlnkn/ratarmount/tree/master/core"; + changelog = "https://github.com/mxmlnkn/ratarmount/blob/core-v${version}/core/CHANGELOG.md"; license = licenses.mit; maintainers = with lib.maintainers; [ mxmlnkn ]; }; From 1c6e127a88be346df00e6bab9246bc778f1b6e58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Sep 2024 09:26:11 +0200 Subject: [PATCH 3/4] python-xz: refactor - update disabled --- pkgs/development/python-modules/python-xz/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-xz/default.nix b/pkgs/development/python-modules/python-xz/default.nix index 83fbc0997e57..526c54245104 100644 --- a/pkgs/development/python-modules/python-xz/default.nix +++ b/pkgs/development/python-modules/python-xz/default.nix @@ -9,18 +9,18 @@ buildPythonPackage rec { pname = "python-xz"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-oYjwQ26BFFXxvaYdzp2+bw/BQwM0v/n1r9DmaLs1R3Q="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - # has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ "xz" ]; @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python library for seeking within compressed xz files"; homepage = "https://github.com/Rogdham/python-xz"; + changelog = "https://github.com/Rogdham/python-xz/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with lib.maintainers; [ mxmlnkn ]; platforms = platforms.all; From a12cb4af188557132fa9e40017d495683d482920 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Sep 2024 09:31:39 +0200 Subject: [PATCH 4/4] python312Packages.ratarmount: refactor --- .../python-modules/ratarmount/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index e084d5fc1a31..bdfa8a21c883 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -2,15 +2,22 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, fusepy, + indexed-gzip, + indexed-zstd, + libarchive-c, + python-xz, + pythonOlder, + rapidgzip, + rarfile, ratarmountcore, + setuptools, }: buildPythonPackage rec { pname = "ratarmount"; version = "0.15.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -19,9 +26,19 @@ buildPythonPackage rec { hash = "sha256-1JAj9vA/aZLDvZC7j5PD1OL9n4I0gag4Ezc0i68OQsw="; }; - propagatedBuildInputs = [ - ratarmountcore + pythonRelaxDeps = [ "python-xz" ]; + + build-system = [ setuptools ]; + + dependencies = [ fusepy + indexed-gzip + indexed-zstd + libarchive-c + python-xz + rapidgzip + rarfile + ratarmountcore ]; checkPhase = '' @@ -34,10 +51,10 @@ buildPythonPackage rec { meta = with lib; { description = "Mounts archives as read-only file systems by way of indexing"; - mainProgram = "ratarmount"; homepage = "https://github.com/mxmlnkn/ratarmount"; + changelog = "https://github.com/mxmlnkn/ratarmount/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with lib.maintainers; [ mxmlnkn ]; - platforms = platforms.all; + mainProgram = "ratarmount"; }; }