summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Risinger <drewrisinger@users.noreply.github.com>2020-12-10 21:14:06 -0500
committerDrew Risinger <drewrisinger@users.noreply.github.com>2020-12-10 21:14:42 -0500
commit6bb2eae2ff86d941c589e4234cf52c897562cbd8 (patch)
tree629ab56793d51306d161b01f59428dcba46467e4
parent25c9946f95a0be44a5794da66da1e7f2ca116d42 (diff)
treewide: remove dead pytestpep8 references
pytestpep8 was removed in 25c9946f95a0be44a5794da66da1e7f2ca116d42. This removes pytestpep8 in the rest of the tree, where it was hardly used.
-rw-r--r--pkgs/applications/misc/ulauncher/default.nix3
-rw-r--r--pkgs/development/python-modules/dyn/default.nix3
-rw-r--r--pkgs/development/python-modules/ics/default.nix4
-rw-r--r--pkgs/development/python-modules/jsonlines/default.nix4
-rw-r--r--pkgs/development/python-modules/keras/default.nix3
-rw-r--r--pkgs/development/python-modules/mwclient/default.nix4
-rw-r--r--pkgs/development/python-modules/progressbar2/default.nix3
-rw-r--r--pkgs/development/python-modules/pydocstyle/2.nix6
-rw-r--r--pkgs/development/python-modules/pydocstyle/default.nix1
-rw-r--r--pkgs/development/python-modules/pylti/default.nix3
-rw-r--r--pkgs/development/python-modules/pytest-factoryboy/default.nix2
-rw-r--r--pkgs/development/python-modules/pytest-flakes/default.nix3
-rw-r--r--pkgs/development/python-modules/pytest-quickcheck/default.nix4
-rw-r--r--pkgs/development/python-modules/python-utils/default.nix4
-rw-r--r--pkgs/development/python-modules/requests-unixsocket/default.nix4
-rw-r--r--pkgs/development/python-modules/subliminal/default.nix3
-rw-r--r--pkgs/development/tools/devpi-server/default.nix1
17 files changed, 22 insertions, 33 deletions
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
index 81e273dd39d8..f1439dc7d161 100644
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@@ -66,7 +66,6 @@ python3Packages.buildPythonApplication rec {
mock
pytest
pytest-mock
- pytestpep8
xvfb_run
];
@@ -95,7 +94,7 @@ python3Packages.buildPythonApplication rec {
# skip tests in invocation that handle paths that
# aren't nix friendly (i think)
xvfb-run -s '-screen 0 1024x768x16' \
- pytest -k 'not TestPath and not test_handle_key_press_event' --pep8 tests
+ pytest -k 'not TestPath and not test_handle_key_press_event' tests
runHook postCheck
'';
diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix
index 6e03a33f29b6..cc7a330e97cf 100644
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/pkgs/development/python-modules/dyn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock, pytestpep8
+{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock
, pytest_xdist, covCore, glibcLocales }:
buildPythonPackage rec {
@@ -16,7 +16,6 @@ buildPythonPackage rec {
pytest
pytestcov
mock
- pytestpep8
pytest_xdist
covCore
];
diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix
index 08799a9fb4b2..9254cee65ab7 100644
--- a/pkgs/development/python-modules/ics/default.nix
+++ b/pkgs/development/python-modules/ics/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
, tatsu, arrow
-, pytestCheckHook, pytestpep8, pytest-flakes
+, pytestCheckHook, pytest-flakes
}:
buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
--replace "arrow>=0.11,<0.15" "arrow"
'';
- checkInputs = [ pytestCheckHook pytestpep8 pytest-flakes ];
+ checkInputs = [ pytestCheckHook pytest-flakes ];
meta = with stdenv.lib; {
description = "Pythonic and easy iCalendar library (RFC 5545)";
diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix
index cde440380b48..82ddb3bf23a7 100644
--- a/pkgs/development/python-modules/jsonlines/default.nix
+++ b/pkgs/development/python-modules/jsonlines/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, buildPythonPackage, six
-, flake8, pep8-naming, pytest, pytestcov, pytestpep8 }:
+, flake8, pep8-naming, pytest, pytestcov }:
buildPythonPackage rec {
pname = "jsonlines";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six ];
- checkInputs = [ flake8 pep8-naming pytest pytestcov pytestpep8 ];
+ checkInputs = [ flake8 pep8-naming pytest pytestcov ];
checkPhase = ''
pytest
'';
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 8b6301ab59b7..f2243a1531f6 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
-, pytest, pytestcov, pytestpep8, pytest_xdist
+, pytest, pytestcov, pytest_xdist
, six, numpy, scipy, pyyaml, h5py
, keras-applications, keras-preprocessing
}:
@@ -16,7 +16,6 @@ buildPythonPackage rec {
checkInputs = [
pytest
pytestcov
- pytestpep8
pytest_xdist
];
diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
index 2744ff9a277c..644f01fdb1f2 100644
--- a/pkgs/development/python-modules/mwclient/default.nix
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, requests, requests_oauthlib, six
-, pytest, pytestpep8, pytestcache, pytestcov, responses, mock
+, pytest, pytestcache, pytestcov, responses, mock
}:
buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj";
};
- checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ];
+ checkInputs = [ pytest pytestcache pytestcov responses mock ];
propagatedBuildInputs = [ requests requests_oauthlib six ];
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index 23ebc9354599..789828b7143f 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -6,7 +6,6 @@
, python-utils
, sphinx
, flake8
-, pytestpep8
, pytest-flakes
, pytestcov
, pytestcache
@@ -26,7 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ python-utils ];
nativeBuildInputs = [ pytestrunner ];
checkInputs = [
- pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov
+ pytest sphinx flake8 pytest-flakes pytestcov
pytestcache freezegun
];
# ignore tests on the nix wrapped setup.py
diff --git a/pkgs/development/python-modules/pydocstyle/2.nix b/pkgs/development/python-modules/pydocstyle/2.nix
index 21e39b68d12c..9ce4ffc0f816 100644
--- a/pkgs/development/python-modules/pydocstyle/2.nix
+++ b/pkgs/development/python-modules/pydocstyle/2.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder
, snowballstemmer, six, configparser
-, pytest, pytestpep8, mock, pathlib }:
+, pytest, mock, pathlib }:
buildPythonPackage rec {
pname = "pydocstyle";
@@ -17,11 +17,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser;
- checkInputs = [ pytest pytestpep8 mock ] ++ lib.optional (pythonOlder "3.4") pathlib;
+ checkInputs = [ pytest mock ] ++ lib.optional (pythonOlder "3.4") pathlib;
checkPhase = ''
# test_integration.py installs packages via pip
- py.test --pep8 --cache-clear -vv src/tests -k "not test_integration"
+ py.test --cache-clear -vv src/tests -k "not test_integration"
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix
index cef9e9644251..36c61ace8563 100644
--- a/pkgs/development/python-modules/pydocstyle/default.nix
+++ b/pkgs/development/python-modules/pydocstyle/default.nix
@@ -1,7 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
, mock
, pytest
-, pytestpep8
, snowballstemmer
}:
diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix
index 752755700b27..a6778a4aa7e8 100644
--- a/pkgs/development/python-modules/pylti/default.nix
+++ b/pkgs/development/python-modules/pylti/default.nix
@@ -14,7 +14,6 @@
, pytestcov
, covCore
, pytest-flakes
-, pytestpep8
, sphinx
, mock
, chalice
@@ -35,7 +34,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ];
checkInputs = [
flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore
- pytest-flakes pytestpep8 sphinx mock chalice
+ pytest-flakes sphinx mock chalice
];
src = fetchPypi {
diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix
index 44a59730146c..b5e65085abec 100644
--- a/pkgs/development/python-modules/pytest-factoryboy/default.nix
+++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix
@@ -7,7 +7,6 @@
, factory_boy
, pytestcache
, pytestcov
-, pytestpep8
, mock
}:
@@ -30,7 +29,6 @@ buildPythonPackage rec {
pytestCheckHook
pytestcache
pytestcov
- pytestpep8
];
pytestFlagsArray = [ "--ignore=docs" ];
diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index 38156cc0ccf5..440cc632185b 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -1,5 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
-, pytestpep8
, pytest
, pyflakes
}:
@@ -16,7 +15,7 @@ buildPythonPackage rec {
sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754";
};
- checkInputs = [ pytestpep8 pytest ];
+ checkInputs = [ pytest ];
propagatedBuildInputs = [ pytest pyflakes ];
# no longer passes
diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix
index 8db28159d9dc..7db982ed857c 100644
--- a/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }:
buildPythonPackage rec {
pname = "pytest-quickcheck";
version = "0.8.6";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
};
buildInputs = [ pytest ];
- propagatedBuildInputs = [ pytest-flakes pytestpep8 tox ];
+ propagatedBuildInputs = [ pytest-flakes tox ];
meta = with stdenv.lib; {
license = licenses.asl20;
diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix
index 936a1eb2e3ed..1e0796e4f009 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/pkgs/development/python-modules/python-utils/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytest-flakes, pytestpep8, sphinx, six }:
+{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytest-flakes, sphinx, six }:
buildPythonPackage rec {
pname = "python-utils";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
rm tests/*.pyc
'';
- checkInputs = [ pytest pytestrunner pytestcov pytest-flakes pytestpep8 sphinx ];
+ checkInputs = [ pytest pytestrunner pytestcov pytest-flakes sphinx ];
checkPhase = ''
py.test tests
diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix
index 5229dd96b75a..f98b68c13a0b 100644
--- a/pkgs/development/python-modules/requests-unixsocket/default.nix
+++ b/pkgs/development/python-modules/requests-unixsocket/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, pbr, requests
-, pytest, pytestpep8, waitress }:
+, pytest, waitress }:
buildPythonPackage rec {
pname = "requests-unixsocket";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pbr ];
propagatedBuildInputs = [ requests ];
- checkInputs = [ pytest pytestpep8 waitress ];
+ checkInputs = [ pytest waitress ];
checkPhase = ''
rm pytest.ini
py.test
diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix
index 25e20a44118c..77ddb125a94b 100644
--- a/pkgs/development/python-modules/subliminal/default.nix
+++ b/pkgs/development/python-modules/subliminal/default.nix
@@ -20,7 +20,6 @@
, sympy
, vcrpy
, pytest
-, pytestpep8
, pytest-flakes
, pytestcov
, pytestrunner
@@ -42,7 +41,7 @@ buildPythonPackage rec {
] ++ lib.optional (!isPy3k) futures;
checkInputs = [
- sympy vcrpy pytest pytestpep8 pytest-flakes
+ sympy vcrpy pytest pytest-flakes
pytestcov pytestrunner
];
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index 53950d08f76b..666a2cef7c53 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -32,7 +32,6 @@ python3Packages.buildPythonApplication rec {
nginx
pytest
pytest-flake8
- pytestpep8
webtest
] ++ stdenv.lib.optionals isPy27 [ mock ];