From ad2341b8261828cee21ac54ae4cfa54f9590b73c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 14:20:12 +0100 Subject: [PATCH 1/3] python311Packages.environs: 9.5.0 -> 10.0.0 Diff: https://github.com/sloria/environs/compare/9.5.0...10.0.0 --- pkgs/development/python-modules/environs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 5591d74d38a0..abd81e1954f8 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "environs"; - version = "9.5.0"; + version = "10.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sloria"; repo = pname; rev = version; - hash = "sha256-hucApIn7ul7+MC2W811VTxZNO8Pqb6HDXz9VRcEdmIc="; + hash = "sha256-B/ICzopFuOAWMlDn950LXmi/XQaQxh5jFVmLdmt7Dlg="; }; propagatedBuildInputs = [ From 2e6cb2571652ad9574a7513176682b16b5db97b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 14:22:55 +0100 Subject: [PATCH 2/3] python311Packages.environs: refactor --- .../python-modules/environs/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index abd81e1954f8..c426aaeeaee5 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -8,22 +8,27 @@ , pytestCheckHook , python-dotenv , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "environs"; version = "10.0.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sloria"; - repo = pname; - rev = version; + repo = "environs"; + rev = "refs/tags/${version}"; hash = "sha256-B/ICzopFuOAWMlDn950LXmi/XQaQxh5jFVmLdmt7Dlg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ marshmallow python-dotenv @@ -43,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python modle for environment variable parsing"; homepage = "https://github.com/sloria/environs"; + changelog = "https://github.com/sloria/environs/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From e2d77603b47977e6daf44ec856e0949ec84c2909 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 16 Dec 2023 15:00:58 +0100 Subject: [PATCH 3/3] python311Packages.deezer-python: disable failing tests --- .../python-modules/deezer-python/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index dd9505625af0..84c7972ccd12 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -14,17 +14,22 @@ buildPythonPackage rec { pname = "deezer-python"; version = "6.1.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "browniebroke"; - repo = pname; + repo = "deezer-python"; rev = "refs/tags/v${version}"; hash = "sha256-pzEXiWKMP2Wqme/pqfTMHxWH/4YcCS6u865wslHrUqI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=deezer" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,15 +46,16 @@ buildPythonPackage rec { tornado ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=deezer" "" - ''; - pythonImportsCheck = [ "deezer" ]; + disabledTests = [ + # JSONDecodeError issue + "test_get_user_flow" + "test_with_language_header" + ]; + meta = with lib; { description = "Python wrapper around the Deezer API"; homepage = "https://github.com/browniebroke/deezer-python";