From f8e0efb139bca25a422a5e08e57f2819a43dea9b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 28 Oct 2018 11:24:29 -0400 Subject: [PATCH] pythonPackages.testpath: refactor move to python-modules --- .../python-modules/testpath/default.nix | 22 ++++++++++++++ pkgs/top-level/python-packages.nix | 29 +------------------ 2 files changed, 23 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/testpath/default.nix diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix new file mode 100644 index 000000000000..cda5abda5292 --- /dev/null +++ b/pkgs/development/python-modules/testpath/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "testpath"; + version = "0.3"; + format = "wheel"; + + src = fetchPypi { + inherit pname version format; + sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e"; + }; + + meta = with stdenv.lib; { + description = "Test utilities for code working with files and commands"; + license = licenses.mit; + homepage = https://github.com/jupyter/testpath; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75d37d4eef18..923a2d8db60d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3949,34 +3949,7 @@ in { testscenarios = callPackage ../development/python-modules/testscenarios { }; - testpath = buildPythonPackage rec { - pname = "testpath"; - version = "0.3"; - name = "${pname}-${version}"; - - #format = "flit"; - #src = pkgs.fetchFromGitHub { - # owner = "jupyter"; - # repo = pname; - # rev = "${version}"; - # sha256 = "1ghzmkrsrk9xrj42pjsq5gl7v3g2v0ji0xy0xzzxp5aizd3wrvl9"; - #}; - #doCheck = true; - #checkPhase = '' - # ${python.interpreter} -m unittest discover - #''; - format = "wheel"; - src = fetchPypi { - inherit pname version format; - sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e"; - }; - - meta = { - description = "Test utilities for code working with files and commands"; - license = licenses.mit; - homepage = https://github.com/jupyter/testpath; - }; - }; + testpath = callPackage ../development/python-modules/testpath { }; testrepository = buildPythonPackage rec { name = "testrepository-${version}";