From b4ac528138c4645d157d25ff5d467a80c978754c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 Dec 2023 15:51:55 +0100 Subject: [PATCH 1/2] python311Packages.pyatmo: 7.6.0 -> 8.0.1 Diff: https://github.com/jabesq/pyatmo/compare/refs/tags/v7.6.0...v8.0.1 Changelog: https://github.com/jabesq/pyatmo/blob/v8.0.1/CHANGELOG.md --- pkgs/development/python-modules/pyatmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 5c37066ae9d1..604735161295 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "7.6.0"; + version = "8.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - hash = "sha256-rAmSxayXljOJchiMtSOgnotzQmapK2n86HwNi9HJX68="; + hash = "sha256-ASjAmkM/BFWzZYnLeXATbZzSG6KBDcmy66/R1MgzAwQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 6cf87a10e2efe57b99a2ef47d90849e6fa6c9db9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 20 Dec 2023 15:53:17 +0100 Subject: [PATCH 2/2] python311Packages.pyatmo: refactor --- .../python-modules/pyatmo/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 604735161295..544990ba7521 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -17,9 +17,9 @@ buildPythonPackage rec { pname = "pyatmo"; version = "8.0.1"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "jabesq"; @@ -30,6 +30,12 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "oauthlib~=3.1" "oauthlib" \ + --replace "requests~=2.24" "requests" + ''; + nativeBuildInputs = [ setuptools-scm ]; @@ -49,12 +55,6 @@ buildPythonPackage rec { time-machine ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "oauthlib~=3.1" "oauthlib" \ - --replace "requests~=2.24" "requests" - ''; - pythonImportsCheck = [ "pyatmo" ];