From 1d06a93281dd633846f178c9e120546c621e7465 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jan 2023 23:02:56 +0100 Subject: [PATCH] python3Packages.odp-amsterdam: init at 5.0.0 Renamed from garages-amsterdam. --- .../default.nix | 22 +++++++++++++------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 18 insertions(+), 9 deletions(-) rename pkgs/development/python-modules/{garages-amsterdam => odp-amsterdam}/default.nix (69%) diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix similarity index 69% rename from pkgs/development/python-modules/garages-amsterdam/default.nix rename to pkgs/development/python-modules/odp-amsterdam/default.nix index 2b25decd4fc8..30c98144906b 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -1,28 +1,33 @@ { lib , aiohttp +, aresponses , buildPythonPackage , fetchFromGitHub , poetry-core , pythonOlder +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { - pname = "garages-amsterdam"; - version = "4.1.0"; + pname = "odp-amsterdam"; + version = "5.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "klaasnicolaas"; - repo = "garages_amsterdam"; + repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZWp543msRAgn/fFplEt6saSNbZ2flC5gwjxrll4w0W0="; + hash = "sha256-zVnM4KYH4R6n2y9IAaYGOZVPnc8RuT/S2bseKJBO9bg="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace '"0.0.0"' '"${version}"' + + sed -i '/addopts/d' pyproject.toml ''; nativeBuildInputs = [ @@ -33,11 +38,14 @@ buildPythonPackage rec { aiohttp ]; - # The only test requires network access - doCheck = false; + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ - "garages_amsterdam" + "odp_amsterdam" ]; meta = with lib; { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 75f5cf537a20..4d842aa556c7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -85,6 +85,7 @@ mapAliases ({ flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 + garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garminconnect-ha = garminconnect; # added 2022-02-05 gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6aaa8a203bd..c07ff886535e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3622,8 +3622,6 @@ self: super: with self; { gast = callPackage ../development/python-modules/gast { }; - garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { }; - gatt = callPackage ../development/python-modules/gatt { }; gattlib = callPackage ../development/python-modules/gattlib { @@ -6452,6 +6450,8 @@ self: super: with self; { odfpy = callPackage ../development/python-modules/odfpy { }; + odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { }; + offtrac = callPackage ../development/python-modules/offtrac { }; ofxclient = callPackage ../development/python-modules/ofxclient { };