diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index a78b55704aec..a848125a55dc 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -8,9 +8,9 @@ , pytestCheckHook , pythonOlder , python-dateutil -, setuptools +, repeated-test +, setuptools-scm , sigtools -, unittest2 }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -42,14 +42,11 @@ buildPythonPackage rec { ]; }; - # repeated_test no longer exists in nixpkgs - # also see: https://github.com/epsy/clize/issues/74 - doCheck = false; checkInputs = [ pytestCheckHook python-dateutil pygments - unittest2 + repeated-test ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix index de64e2f8fdc8..805aec6c1e69 100644 --- a/pkgs/development/python-modules/od/default.nix +++ b/pkgs/development/python-modules/od/default.nix @@ -1,25 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, unittest2 }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, repeated-test +}: buildPythonPackage rec { pname = "od"; version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; + hash = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; }; - # repeated_test no longer exists in nixpkgs - # also see: https://github.com/epsy/od/issues/1 - doCheck = false; checkInputs = [ - unittest2 + repeated-test + ]; + + pythonImportsCheck = [ + "od" ]; meta = with lib; { description = "Shorthand syntax for building OrderedDicts"; homepage = "https://github.com/epsy/od"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/repeated-test/default.nix b/pkgs/development/python-modules/repeated-test/default.nix new file mode 100644 index 000000000000..bd8d8d765a09 --- /dev/null +++ b/pkgs/development/python-modules/repeated-test/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "repeated-test"; + version = "2.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + pname = "repeated_test"; + inherit version; + hash = "sha256-TbVyQA7EjCSwo6qfDksbE8IU1ElkSCABEUBWy5j1KJc="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "repeated_test" + ]; + + meta = with lib; { + description = "Unittest-compatible framework for repeating a test function over many fixtures"; + homepage = "https://github.com/epsy/repeated_test"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index cf32ad5db79c..a41bdbf184bd 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -1,14 +1,13 @@ { lib +, attrs , buildPythonPackage , fetchPypi -, sphinx , mock -, coverage -, unittest2 -, attrs -, funcsigs -, six +, pythonOlder +, repeated-test , setuptools-scm +, sphinx +, unittestCheckHook }: buildPythonPackage rec { @@ -16,9 +15,11 @@ buildPythonPackage rec { version = "4.0.1"; format = "pyproject"; + disabled = pythonOlder "3.4"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw="; + hash = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw="; }; nativeBuildInputs = [ @@ -29,17 +30,21 @@ buildPythonPackage rec { attrs ]; - patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py''; + checkInputs = [ + mock + repeated-test + sphinx + unittestCheckHook + ]; - # repeated_test no longer exists in nixpkgs - # Also see: https://github.com/epsy/sigtools/issues/26 - doCheck = false; - checkInputs = [ sphinx mock coverage unittest2 ]; + pythonImportsCheck = [ + "sigtools" + ]; meta = with lib; { - description = "Utilities for working with 3.3's inspect.Signature objects."; - homepage = "https://pypi.python.org/pypi/sigtools"; + description = "Utilities for working with inspect.Signature objects"; + homepage = "https://sigtools.readthedocs.io/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 44b34cf2071f..eb85a22c71e2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -179,7 +179,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 - repeated_test = throw "repeated_test is no longer maintained"; # added 2022-01-11 + repeated_test = repeated-test; # added 2022-11-15 requests_oauthlib = requests-oauthlib; # added 2022-02-12 requests_toolbelt = requests-toolbelt; # added 2017-09-26 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41b7be65a256..431d9a46cba7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9654,6 +9654,8 @@ self: super: with self; { reparser = callPackage ../development/python-modules/reparser { }; + repeated-test = callPackage ../development/python-modules/repeated-test { }; + repocheck = callPackage ../development/python-modules/repocheck { }; reportengine = callPackage ../development/python-modules/reportengine { };