From bb98b3f808b945b9c5ec986a81ad5be653cff682 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Oct 2024 00:59:03 +0200 Subject: [PATCH 1/4] python312Packages.pygmars: 0.8.1 -> 0.9.0 Diff: https://github.com/nexB/pygmars/compare/refs/tags/v0.8.1...v0.9.0 Changelog: https://github.com/nexB/pygmars/releases/tag/v0.9.0 --- pkgs/development/python-modules/pygmars/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix index 11bd26ee9531..b245f5b9b0ff 100644 --- a/pkgs/development/python-modules/pygmars/default.nix +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pygmars"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nexB"; repo = "pygmars"; rev = "refs/tags/v${version}"; - hash = "sha256-RwAZ1ZLh0zgGshSv7LleBHMotKapDFtD69ptqQnr0EA="; + hash = "sha256-OhmTD83p/4tCMoCXy35/0fy8Tw1usn27dJyzpOeGlkU="; }; dontConfigure = true; From 86949ce04359dfa8ba4e2cf806782206c715fc5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Oct 2024 01:01:51 +0200 Subject: [PATCH 2/4] python312Packages.pygmars: update disabled - update changelog URL --- pkgs/development/python-modules/pygmars/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix index b245f5b9b0ff..634788bdf9a1 100644 --- a/pkgs/development/python-modules/pygmars/default.nix +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "nexB"; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python lexing and parsing library"; homepage = "https://github.com/nexB/pygmars"; - changelog = "https://github.com/nexB/pygmars/releases/tag/v${version}"; + changelog = "https://github.com/aboutcode-org/pygmars/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 38c8f97104b00e3d290c91e6a38d426d9520d6e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 11:42:30 +0100 Subject: [PATCH 3/4] python312Packages.packvers: disable failing test --- .../python-modules/packvers/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix index 50bdaff9db6f..4f7cc686d9e6 100644 --- a/pkgs/development/python-modules/packvers/default.nix +++ b/pkgs/development/python-modules/packvers/default.nix @@ -6,23 +6,26 @@ pyparsing, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "packvers"; version = "21.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nexB"; - repo = pname; + repo = "packvers"; rev = "refs/tags/${version}"; hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE="; }; - propagatedBuildInputs = [ pyparsing ]; + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; nativeCheckInputs = [ pretend @@ -31,9 +34,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "packvers" ]; + disabledTests = [ + # Failed: DID NOT RAISE + "test_invalid_file_urls" + ]; + meta = with lib; { description = "Module for version handling of modules"; - homepage = "https://github.com/nexB/dparse2"; + homepage = "https://github.com/aboutcode-org/packvers"; changelog = "https://github.com/nexB/packvers/blob/${version}/CHANGELOG.rst"; license = with licenses; [ asl20 # and From 1b380587f21f239646fd8fff574dcc0fc33a9562 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 11:45:11 +0100 Subject: [PATCH 4/4] python312Packages.extractcode: refactor --- .../python-modules/extractcode/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 350ff622f6c2..6d9ff4548eb4 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -10,13 +10,14 @@ pythonOlder, setuptools-scm, six, + setuptools, typecode, }: buildPythonPackage rec { pname = "extractcode"; version = "31.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -33,9 +34,9 @@ buildPythonPackage rec { dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ typecode patch extractcode-libarchive @@ -67,16 +68,18 @@ buildPythonPackage rec { "test_patch_info_patch_patches_windows_plugin_explorer_patch" # AssertionError: assert [['linux-2.6...._end;', ...]]] == [['linux-2.6...._end;', ...]]] "test_patch_info_patch_patches_misc_linux_st710x_patches_motorola_rootdisk_c_patch" + # extractcode.libarchive2.ArchiveErrorRetryable: Damaged tar archive + "test_extract_python_testtar_tar_archive_with_special_files" ]; pythonImportsCheck = [ "extractcode" ]; meta = with lib; { description = "Universal archive extractor using z7zip, libarchive, other libraries and the Python standard library"; - mainProgram = "extractcode"; - homepage = "https://github.com/nexB/extractcode"; - changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}"; + homepage = "https://github.com/aboutcode-org/extractcode"; + changelog = "https://github.com/aboutcode-org/extractcode/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ ]; + mainProgram = "extractcode"; }; }