From 3dbb883877f4c83f622bbd6a1f5e9d727f2bdae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Nov 2024 11:27:44 -0800 Subject: [PATCH] python312Packages.datapoint: 0.9.9 -> 0.12.1 Diff: https://github.com/EJEP/datapoint-python/compare/v0.9.9...0.12.1 Changelog: https://github.com/EJEP/datapoint-python/blob/0.12.1/CHANGELOG.md --- .../python-modules/datapoint/default.nix | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/datapoint/default.nix b/pkgs/development/python-modules/datapoint/default.nix index 9b5bd87ec68d..3196e966a087 100644 --- a/pkgs/development/python-modules/datapoint/default.nix +++ b/pkgs/development/python-modules/datapoint/default.nix @@ -2,43 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, appdirs, - pytz, + geojson, + hatchling, requests, pytestCheckHook, requests-mock, pythonOlder, - setuptools, + versioningit, }: buildPythonPackage rec { pname = "datapoint"; - version = "0.9.9"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "ejep"; + owner = "EJEP"; repo = "datapoint-python"; - tag = "v${version}"; - hash = "sha256-zUvwfBwJe8SaB96/Jz7Qeanz1mHmLVp2JW9qkR2dRnY="; + tag = version; + hash = "sha256-caIbz/tMQbFKK5UVhYiEnGv3EoI3H2y5V4EDASQ253o="; }; - patches = [ - (fetchpatch2 { - # Hardcode version (instead of using versioneer) - url = "https://github.com/EJEP/datapoint-python/commit/57e649b26ecf39fb11f507eb920b1d059d433721.patch"; - hash = "sha256-trOPtwlaJDeA4Kau4fwZCxqJiw96+T/le461t09O8io="; - }) + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + build-system = [ + hatchling + versioningit ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ appdirs - pytz + geojson requests ]; @@ -47,14 +47,12 @@ buildPythonPackage rec { requests-mock ]; - pytestFlagsArray = [ "tests/unit" ]; - pythonImportsCheck = [ "datapoint" ]; meta = { description = "Python interface to the Met Office's Datapoint API"; - homepage = "https://github.com/ejep/datapoint-python"; - changelog = "https://github.com/EJEP/datapoint-python/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/EJEP/datapoint-python"; + changelog = "https://github.com/EJEP/datapoint-python/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ dotlambda ]; };