about summary refs log tree commit diff
path: root/pkgs/development/python-modules/tempora
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2020-08-18 00:53:53 -0700
committerJon <jonringer@users.noreply.github.com>2020-08-19 00:43:21 -0700
commitaf96702aacfcdc87bc232d0a3e53621c8c3f2360 (patch)
treeba7eaa500b2bd5410eb70fe0ce9d14773cbd65da /pkgs/development/python-modules/tempora
parent8d881b0d7b3bcadcec37c5c883b81c1712655d37 (diff)
python3Packages.tempora: fix tests
Diffstat (limited to 'pkgs/development/python-modules/tempora')
-rw-r--r--pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch28
-rw-r--r--pkgs/development/python-modules/tempora/default.nix9
2 files changed, 4 insertions, 33 deletions
diff --git a/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch b/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch
deleted file mode 100644
index f807a6d2515e3..0000000000000
--- a/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9dfd2a8fac4a643fd007390762ccc8564588b4bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
-Date: Thu, 25 Jun 2020 10:16:52 +0100
-Subject: [PATCH] pytest: remove flake8/black/coverage
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
----
- pytest.ini | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pytest.ini b/pytest.ini
-index bd6998d..a464529 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -1,6 +1,6 @@
- [pytest]
- norecursedirs=dist build .tox .eggs
--addopts=--doctest-modules --flake8 --black --cov
-+addopts=--doctest-modules
- doctest_optionflags=ALLOW_UNICODE ELLIPSIS
- filterwarnings=
- 	# suppress known warning
--- 
-2.27.0
-
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index 72310a700c8ee..238b250136cb6 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -1,6 +1,8 @@
 { lib, buildPythonPackage, fetchPypi
 , setuptools_scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock
-, six, pytz, jaraco_functools, pythonOlder }:
+, six, pytz, jaraco_functools, pythonOlder
+, pytest-flake8, pytestcov, pytest-black, pytest-mypy
+}:
 
 buildPythonPackage rec {
   pname = "tempora";
@@ -15,14 +17,11 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools_scm ];
 
-  patches = [
-    ./0001-pytest-remove-flake8-black-coverage.patch
-  ];
-
   propagatedBuildInputs = [ six pytz jaraco_functools ];
 
   checkInputs = [
     pytest-freezegun pytest freezegun backports_unittest-mock
+    pytest-flake8 pytestcov pytest-black pytest-mypy
   ];
 
   checkPhase = ''