From f90ad2b3e2e760452d55b39a70a5ea82b4115787 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Apr 2023 21:33:03 +0200 Subject: [PATCH 1/2] python310Packages.ovh: update meta --- pkgs/development/python-modules/ovh/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index a8b769ff905b..4cb47f7b3cce 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -40,10 +40,11 @@ buildPythonPackage rec { -e test_init_from_custom_config ''; - meta = { + meta = with lib; { description = "Thin wrapper around OVH's APIs"; homepage = "https://github.com/ovh/python-ovh"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.makefu ]; + changelog = "https://github.com/ovh/python-ovh/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd2; + maintainers = with maintainers; [ makefu ]; }; } From 470b09cf881cfc3502789d74012538bf3beebb39 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Apr 2023 21:40:28 +0200 Subject: [PATCH 2/2] python310Packages.ovh: 1.0.1 -> 1.1.0 Changelog: https://github.com/ovh/python-ovh/blob/v1.1.0/CHANGELOG.md --- .../python-modules/ovh/default.nix | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 4cb47f7b3cce..7ac42a4ff0de 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -1,44 +1,43 @@ { lib , buildPythonPackage , fetchPypi -, mock -, nose +, pytestCheckHook +, pythonOlder , requests -, yanc }: buildPythonPackage rec { pname = "ovh"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - hash = "sha256-IQzwu0gwfPNPOLQLCO99KL5Hu2094Y+acQBFXVGzHhU="; + hash = "sha256-EI+bWjtHEZPOSkWJx3gvS8y//gugMWl3TrBHKsKO9nk="; }; propagatedBuildInputs = [ requests ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - nativeCheckInputs = [ - mock - nose - yanc + pytestCheckHook ]; - # requires network - checkPhase = '' - nosetests . \ - -e test_config_get_conf \ - -e test_config_get_custom_conf \ - -e test_endpoints \ - -e test_init_from_custom_config - ''; + pythonImportsCheck = [ + "ovh" + ]; + + disabledTests = [ + # Tests require network access + "test_config_from_files" + "test_config_from_given_config_file" + "test_config_from_invalid_ini_file" + "test_config_from_only_one_file" + "test_endpoints" + ]; meta = with lib; { description = "Thin wrapper around OVH's APIs";