diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix index 3669009d530e..ea450651da7e 100644 --- a/pkgs/development/python-modules/univers/default.nix +++ b/pkgs/development/python-modules/univers/default.nix @@ -1,49 +1,66 @@ { lib -, fetchPypi -, fetchpatch -, buildPythonPackage -, setuptools-scm , attrs +, buildPythonPackage +, commoncode +, fetchPypi , packaging , pyparsing +, pytestCheckHook +, pythonOlder +, saneyaml , semantic-version , semver -, commoncode -, pytestCheckHook -, saneyaml +, setuptools-scm }: buildPythonPackage rec { pname = "univers"; - version = "30.7.0"; + version = "30.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yM0SDBpkiZEbaZ0ugjiMwwUFKqZGbmh1JNlv5qvPAYo="; + hash = "sha256-IJeM9Nzfqs1B0xP43i6u65XSEVPdiGhXWuORglbNARI="; }; - patches = [ - # Make tests work when not using virtualenv, can be dropped with the next version - # Upstream PR (already merged): https://github.com/nexB/univers/pull/77 - (fetchpatch { - url = "https://github.com/nexB/univers/commit/b74229cc1c8790287633cd7220d6b2e97c508302.patch"; - hash = "sha256-i6zWv9rAlwCMghd9g5FP6WIQLLDLYvp+6qJ1E7nfTSY="; - }) + nativeBuildInputs = [ + setuptools-scm ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ attrs packaging pyparsing semantic-version semver ]; - nativeCheckInputs = [ commoncode pytestCheckHook saneyaml ]; + propagatedBuildInputs = [ + attrs + packaging + pyparsing + semantic-version + semver + ]; + + nativeCheckInputs = [ + commoncode + pytestCheckHook + saneyaml + ]; dontConfigure = true; # ./configure tries to setup virtualenv and downloads dependencies - disabledTests = [ "test_codestyle" ]; + pythonImportsCheck = [ + "univers" + ]; - pythonImportsCheck = [ "univers" ]; + disabledTests = [ + # No value for us + "test_codestyle" + # AssertionError starting with 30.10.0 + "test_enhanced_semantic_version" + "test_semver_version" + ]; meta = with lib; { description = "Library for parsing version ranges and expressions"; homepage = "https://github.com/nexB/univers"; + changelog = "https://github.com/nexB/univers/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 bsd3 mit ]; maintainers = with maintainers; [ armijnhemel sbruder ]; };