diff options
Diffstat (limited to 'pkgs/development/python-modules/commoncode/default.nix')
-rw-r--r-- | pkgs/development/python-modules/commoncode/default.nix | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 64be571561965..3e8c1eb0182e3 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -5,10 +5,9 @@ beautifulsoup4, buildPythonPackage, click, - fetchPypi, + fetchFromGitHub, pytest-xdist, pytestCheckHook, - pythonAtLeast, pythonOlder, requests, saneyaml, @@ -18,21 +17,23 @@ buildPythonPackage rec { pname = "commoncode"; - version = "31.0.3"; - format = "pyproject"; + version = "32.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ura55/m/iesqN6kSYmdHB1sbthSHXaFWiQ76wVmyl0E="; + src = fetchFromGitHub { + owner = "nexB"; + repo = "commoncode"; + rev = "refs/tags/v${version}"; + hash = "sha256-yqvsBJHrxVkSqp3QnYmHDJr3sef/g4pkSlkSioYuOc4="; }; dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ attrs beautifulsoup4 click @@ -56,17 +57,12 @@ buildPythonPackage rec { "test_walk_can_walk_non_utf8_path_from_unicode_path" "test_resource_iter_can_walk_non_utf8_path_from_unicode_path_with_dirs" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # expected result is tailored towards the quirks of upstream's # CI environment on darwin "test_searchable_paths" ]; - disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/nexB/commoncode/issues/36 - "src/commoncode/fetch.py" - ]; - pythonImportsCheck = [ "commoncode" ]; meta = with lib; { @@ -74,6 +70,6 @@ buildPythonPackage rec { homepage = "https://github.com/nexB/commoncode"; changelog = "https://github.com/nexB/commoncode/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } |