diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index 2f7574a32f95..956e71bff605 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -1,25 +1,27 @@ -{ lib -, appdirs -, argparse -, buildPythonPackage -, doit -, fetchPypi -, ftfy -, mock -, pyinstaller-versionfile -, pytestCheckHook -, python3 -, pythonOlder -, requests -, pythonRelaxDepsHook -, setuptools -, setuptools-scm -, tableauserverclient -, types-appdirs -, types-mock -, types-requests -, types-setuptools -, urllib3 +{ + lib, + appdirs, + argparse, + buildPythonPackage, + doit, + fetchPypi, + ftfy, + mock, + pyinstaller-versionfile, + pytest-order, + pytestCheckHook, + python3, + pythonOlder, + pythonRelaxDepsHook, + requests, + setuptools, + setuptools-scm, + tableauserverclient, + types-appdirs, + types-mock, + types-requests, + types-setuptools, + urllib3, }: buildPythonPackage rec { @@ -34,17 +36,22 @@ buildPythonPackage rec { hash = "sha256-f9zoYeb4RzcCtgcCYYvvuCuFrjqpP3Fhv38bUWH24+g="; }; + prePatch = '' + # Remove an unneeded dependency that can't be resolved + # https://github.com/tableau/tabcmd/pull/282 + sed -i "/'argparse',/d" pyproject.toml + ''; + pythonRelaxDeps = [ "tableauserverclient" "urllib3" ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - setuptools - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ appdirs argparse doit @@ -62,14 +69,10 @@ buildPythonPackage rec { nativeCheckInputs = [ mock + pytest-order pytestCheckHook ]; - # Remove an unneeded dependency that can't be resolved - prePatch = '' - sed -i "/'argparse',/d" pyproject.toml - ''; - # Create a "tabcmd" executable postInstall = '' # Create a directory for our wrapped binary. @@ -87,13 +90,14 @@ buildPythonPackage rec { chmod +x $out/bin/tabcmd ''; + pythonImportsCheck = [ "tabcmd" ]; meta = with lib; { - description = "A command line client for working with Tableau Server."; - mainProgram = "tabcmd"; + description = "A command line client for working with Tableau Server"; homepage = "https://github.com/tableau/tabcmd"; changelog = "https://github.com/tableau/tabcmd/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "tabcmd"; }; } diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index ef7b45698158..1933aed78853 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -1,36 +1,33 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, urllib3 -, types-urllib3 +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + types-urllib3, + urllib3, }: buildPythonPackage rec { pname = "types-requests"; - version = "2.31.0.20240311"; + version = "2.31.0.20240403"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-scG2ar+3+nmq4JCXqBHEqpcTDriDHGDkeu5Mo0RzHKU="; + hash = "sha256-4eDNC2VTNPOdn4craKExDw40Nkdoi/LO6TLsTCsE3lk="; }; - nativeBuildInputs = [ - setuptools - urllib3 - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ types-urllib3 + urllib3 ]; # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ - "requests-stubs" - ]; + pythonImportsCheck = [ "requests-stubs" ]; meta = with lib; { description = "Typing stubs for requests";