From 4209fed914e4362f952f4fa6d88c1808aa3df7b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 22:42:24 +0200 Subject: [PATCH 01/11] pythonPackages: deprecate pytestcov alias --- pkgs/applications/graphics/cq-editor/default.nix | 2 +- pkgs/applications/misc/buku/default.nix | 2 +- .../networking/instant-messengers/zulip-term/default.nix | 2 +- pkgs/applications/office/todoman/default.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 2 +- pkgs/development/libraries/galario/default.nix | 2 +- pkgs/development/python-modules/APScheduler/default.nix | 4 ++-- pkgs/development/python-modules/aioftp/default.nix | 4 ++-- pkgs/development/python-modules/aiohttp-jinja2/default.nix | 4 ++-- pkgs/development/python-modules/aiohttp-remotes/default.nix | 4 ++-- pkgs/development/python-modules/aiostream/default.nix | 4 ++-- pkgs/development/python-modules/alembic/default.nix | 4 ++-- pkgs/development/python-modules/apprise/default.nix | 4 ++-- pkgs/development/python-modules/aria2p/default.nix | 4 ++-- pkgs/development/python-modules/arrow/2.nix | 4 ++-- pkgs/development/python-modules/atpublic/default.nix | 4 ++-- .../python-modules/backports_functools_lru_cache/default.nix | 4 ++-- pkgs/development/python-modules/capturer/default.nix | 2 +- pkgs/development/python-modules/cfn-flip/default.nix | 4 ++-- pkgs/development/python-modules/cftime/default.nix | 4 ++-- pkgs/development/python-modules/cheroot/default.nix | 4 ++-- pkgs/development/python-modules/cherrypy/17.nix | 4 ++-- pkgs/development/python-modules/cherrypy/default.nix | 4 ++-- pkgs/development/python-modules/clickclick/default.nix | 4 ++-- pkgs/development/python-modules/cookiecutter/default.nix | 4 ++-- pkgs/development/python-modules/cssselect2/default.nix | 4 ++-- pkgs/development/python-modules/dbus-next/default.nix | 4 ++-- pkgs/development/python-modules/diskcache/default.nix | 4 ++-- pkgs/development/python-modules/django-extensions/default.nix | 4 ++-- pkgs/development/python-modules/dockerfile-parse/default.nix | 4 ++-- pkgs/development/python-modules/dogpile.cache/default.nix | 4 ++-- pkgs/development/python-modules/dyn/default.nix | 4 ++-- pkgs/development/python-modules/easysnmp/default.nix | 4 ++-- pkgs/development/python-modules/flask-caching/default.nix | 4 ++-- pkgs/development/python-modules/flickrapi/default.nix | 4 ++-- pkgs/development/python-modules/flufl/lock.nix | 4 ++-- pkgs/development/python-modules/graspologic/default.nix | 4 ++-- pkgs/development/python-modules/gunicorn/19.nix | 4 ++-- pkgs/development/python-modules/gunicorn/default.nix | 4 ++-- pkgs/development/python-modules/hickle/default.nix | 4 ++-- pkgs/development/python-modules/httpcore/default.nix | 4 ++-- pkgs/development/python-modules/httpx/default.nix | 4 ++-- pkgs/development/python-modules/hyppo/default.nix | 4 ++-- .../development/python-modules/ibm-cloud-sdk-core/default.nix | 4 ++-- pkgs/development/python-modules/inquirer/default.nix | 4 ++-- pkgs/development/python-modules/iocapture/default.nix | 4 ++-- pkgs/development/python-modules/ipydatawidgets/default.nix | 4 ++-- pkgs/development/python-modules/jedi/default.nix | 4 ++-- pkgs/development/python-modules/jira/default.nix | 4 ++-- pkgs/development/python-modules/jsonlines/default.nix | 4 ++-- pkgs/development/python-modules/jupyterlab_server/default.nix | 2 +- pkgs/development/python-modules/keras/default.nix | 4 ++-- pkgs/development/python-modules/libais/default.nix | 4 ++-- pkgs/development/python-modules/m3u8/default.nix | 4 ++-- .../python-modules/markdownsuperscript/default.nix | 4 ++-- .../python-modules/marshmallow-polyfield/default.nix | 4 ++-- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- pkgs/development/python-modules/multidict/default.nix | 4 ++-- pkgs/development/python-modules/mwclient/default.nix | 4 ++-- pkgs/development/python-modules/natsort/default.nix | 4 ++-- pkgs/development/python-modules/nbdime/default.nix | 4 ++-- pkgs/development/python-modules/nbval/default.nix | 4 ++-- pkgs/development/python-modules/nipype/default.nix | 4 ++-- .../python-modules/nix-prefetch-github/default.nix | 4 ++-- pkgs/development/python-modules/nplusone/default.nix | 4 ++-- .../python-modules/openapi-schema-validator/default.nix | 4 ++-- .../python-modules/openapi-spec-validator/default.nix | 4 ++-- pkgs/development/python-modules/orm/default.nix | 4 ++-- pkgs/development/python-modules/papermill/default.nix | 4 ++-- pkgs/development/python-modules/papis/default.nix | 4 ++-- pkgs/development/python-modules/periodictable/default.nix | 4 ++-- pkgs/development/python-modules/pglast/default.nix | 4 ++-- pkgs/development/python-modules/phonemizer/default.nix | 4 ++-- .../python-modules/plaster-pastedeploy/default.nix | 4 ++-- pkgs/development/python-modules/plaster/default.nix | 4 ++-- pkgs/development/python-modules/poetry/default.nix | 4 ++-- pkgs/development/python-modules/portalocker/default.nix | 2 +- pkgs/development/python-modules/portend/default.nix | 4 ++-- pkgs/development/python-modules/prance/default.nix | 4 ++-- pkgs/development/python-modules/property-manager/default.nix | 4 ++-- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- .../python-modules/py-air-control-exporter/default.nix | 4 ++-- pkgs/development/python-modules/pycategories/default.nix | 4 ++-- pkgs/development/python-modules/pyls-mypy/default.nix | 4 ++-- pkgs/development/python-modules/pylti/default.nix | 4 ++-- .../python-modules/pytest-astropy-header/default.nix | 4 ++-- pkgs/development/python-modules/pytest-factoryboy/default.nix | 4 ++-- .../python-modules/pytest-filter-subpackage/default.nix | 4 ++-- pkgs/development/python-modules/pytest-shutil/default.nix | 4 ++-- pkgs/development/python-modules/pytest-timeout/default.nix | 4 ++-- pkgs/development/python-modules/pytest-virtualenv/default.nix | 4 ++-- pkgs/development/python-modules/python-hosts/default.nix | 4 ++-- .../python-modules/python-jsonrpc-server/default.nix | 4 ++-- .../python-modules/python-language-server/default.nix | 4 ++-- pkgs/development/python-modules/python-lz4/default.nix | 4 ++-- pkgs/development/python-modules/python-multipart/default.nix | 4 ++-- pkgs/development/python-modules/qcelemental/default.nix | 4 ++-- pkgs/development/python-modules/qcengine/default.nix | 4 ++-- pkgs/development/python-modules/rasterio/default.nix | 4 ++-- pkgs/development/python-modules/readchar/default.nix | 4 ++-- pkgs/development/python-modules/reikna/default.nix | 4 ++-- pkgs/development/python-modules/resampy/default.nix | 4 ++-- pkgs/development/python-modules/rising/default.nix | 4 ++-- pkgs/development/python-modules/runway-python/default.nix | 4 ++-- pkgs/development/python-modules/rxv/default.nix | 4 ++-- pkgs/development/python-modules/scikit-build/default.nix | 4 ++-- .../python-modules/scrapy-fake-useragent/default.nix | 4 ++-- pkgs/development/python-modules/skorch/default.nix | 4 ++-- pkgs/development/python-modules/softlayer/default.nix | 4 ++-- pkgs/development/python-modules/stripe/default.nix | 4 ++-- pkgs/development/python-modules/stups-cli-support/default.nix | 4 ++-- pkgs/development/python-modules/stups-fullstop/default.nix | 4 ++-- pkgs/development/python-modules/stups-pierone/default.nix | 4 ++-- pkgs/development/python-modules/stups-tokens/default.nix | 4 ++-- pkgs/development/python-modules/stups-zign/default.nix | 4 ++-- pkgs/development/python-modules/subliminal/default.nix | 4 ++-- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- pkgs/development/python-modules/tablib/default.nix | 4 ++-- pkgs/development/python-modules/tempora/default.nix | 4 ++-- pkgs/development/python-modules/textwrap3/default.nix | 4 ++-- pkgs/development/python-modules/threadpoolctl/default.nix | 4 ++-- pkgs/development/python-modules/timezonefinder/default.nix | 4 ++-- pkgs/development/python-modules/tinycss2/default.nix | 4 ++-- pkgs/development/python-modules/toggl-cli/default.nix | 4 ++-- pkgs/development/python-modules/typer/default.nix | 4 ++-- pkgs/development/python-modules/typesentry/default.nix | 4 ++-- pkgs/development/python-modules/typesystem/default.nix | 4 ++-- pkgs/development/python-modules/uarray/default.nix | 4 ++-- pkgs/development/python-modules/venusian/default.nix | 4 ++-- pkgs/development/python-modules/weasyprint/default.nix | 4 ++-- pkgs/development/python-modules/word2vec/default.nix | 4 ++-- pkgs/development/python-modules/wordcloud/default.nix | 4 ++-- pkgs/development/tools/sourcetrail/jedi.nix | 4 ++-- pkgs/development/tools/vim-vint/default.nix | 2 +- pkgs/servers/dns/doh-proxy/default.nix | 2 +- pkgs/tools/admin/lexicon/default.nix | 2 +- pkgs/tools/admin/salt/pepper/default.nix | 2 +- pkgs/tools/backup/zfs-replicate/default.nix | 4 ++-- pkgs/tools/filesystems/gitfs/default.nix | 2 +- pkgs/tools/misc/bonfire/default.nix | 2 +- pkgs/tools/security/vulnix/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 3 +-- 143 files changed, 268 insertions(+), 268 deletions(-) diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index b9b2eb368735..33bae268c8a6 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -41,7 +41,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pytest pytest-xvfb pytest-mock - pytestcov + pytest-cov pytest-repeat pytest-qt ]; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 68b4f7b3e560..c559e239c09e 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -12,7 +12,7 @@ with python3.pkgs; buildPythonApplication rec { }; checkInputs = [ - pytestcov + pytest-cov hypothesis pytest pylint diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index e97ea7bb65f5..b2f80c70d240 100644 --- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { glibcLocales ] ++ (with python3.pkgs; [ pytestCheckHook - pytestcov + pytest-cov pytest-mock ]); diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 5894c6c3e141..83bbc6cf53f9 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -45,7 +45,7 @@ buildPythonApplication rec { hypothesis pytest pytestrunner - pytestcov + pytest-cov glibcLocales ]; diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index d0bfa5b0b962..4bdad5f7c61c 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens -, pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx +, pycryptodome, pytest_xdist, pytest-cov, recommonmark, semantic-version, sphinx , sphinx_rtd_theme, pytestrunner }: let diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 4e28f84bacdb..7fb93a61a0fe 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.pytest ]; - checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ]; + checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ]; preConfigure = '' mkdir -p build/external/src diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 1a27c8c1f0fc..a4083707a072 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -6,7 +6,7 @@ , pytestCheckHook , pytest-asyncio , pytest-tornado -, pytestcov +, pytest-cov , sqlalchemy , tornado , twisted @@ -38,7 +38,7 @@ buildPythonPackage rec { pytest-asyncio pytest-tornado pytestCheckHook - pytestcov + pytest-cov sqlalchemy tornado twisted diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index e3ca13859acc..a610dba76614 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -4,7 +4,7 @@ , isPy27 , pytest , pytest-asyncio -, pytestcov +, pytest-cov , trustme , async-timeout }: @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-asyncio - pytestcov + pytest-cov trustme async-timeout ]; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 0a939dfb0097..589aa14509e2 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytest-cov }: buildPythonPackage rec { pname = "aiohttp-jinja2"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp jinja2 ]; - checkInputs = [ pytest pytest-aiohttp pytestcov ]; + checkInputs = [ pytest pytest-aiohttp pytest-cov ]; checkPhase = '' pytest -W ignore::DeprecationWarning diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 8a8f7c4b3132..f3abbddfd957 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -1,5 +1,5 @@ { lib, fetchpatch, buildPythonPackage, fetchPypi -, aiohttp, pytest, pytestcov, pytest-aiohttp +, aiohttp, pytest, pytest-cov, pytest-aiohttp }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ pytest pytestcov pytest-aiohttp ]; + checkInputs = [ pytest pytest-cov pytest-aiohttp ]; checkPhase = '' python -m pytest ''; diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index 0bdab3bb2833..e15271bafdbc 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook -, pytestcov +, pytest-cov , pytest-asyncio }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13"; }; - checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; meta = with lib; { description = "Generator-based operators for asynchronous iteration"; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 81502a470a68..9c7244b3c066 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, coverage, setuptools +, pytest, pytest-cov, mock, coverage, setuptools , Mako, sqlalchemy, python-editor, python-dateutil }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"; }; - buildInputs = [ pytest pytestcov mock coverage ]; + buildInputs = [ pytest pytest-cov mock coverage ]; propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; # no traditional test suite diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 61cfed3dbb9e..1bf5a93130dd 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, installShellFiles , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography -, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytestcov, tox, gntp, sleekxmpp +, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestrunner coverage flake8 mock pytestCheckHook pytestcov tox gntp sleekxmpp + pytestrunner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp ]; disabledTests = [ "test_apprise_cli_nux_env" ]; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 9ea4fdf64b5b..4755c80e707c 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, aria2, poetry, pytest, pytestcov, pytest_xdist, responses +, aria2, poetry, pytest, pytest-cov, pytest_xdist, responses , asciimatics, loguru, requests, setuptools, websocket-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ aria2 responses pytest pytestcov pytest_xdist ]; + checkInputs = [ aria2 responses pytest pytest-cov pytest_xdist ]; # Tests are not all stable/deterministic, # they rely on actually running an aria2c daemon and communicating with it, diff --git a/pkgs/development/python-modules/arrow/2.nix b/pkgs/development/python-modules/arrow/2.nix index d87f1ede3ccd..88864ec78b77 100644 --- a/pkgs/development/python-modules/arrow/2.nix +++ b/pkgs/development/python-modules/arrow/2.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , nose, chai, simplejson, backports_functools_lru_cache -, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov +, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytest-cov , pytestCheckHook }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ dateparser pytestCheckHook - pytestcov + pytest-cov pytest-mock pytz simplejson diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 5f00955eef92..4d96bcbe26b5 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -1,6 +1,6 @@ { lib, isPy3k, pythonOlder, fetchPypi, buildPythonPackage , pytest -, pytestcov +, pytest-cov , sybil , typing-extensions }: @@ -20,7 +20,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest pytestcov sybil + pytest pytest-cov sybil ]; checkPhase = '' diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 586176300b7d..cb5665363f9c 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -6,7 +6,7 @@ , pytest , pytest-black , pytest-flake8 -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest pytest-flake8 pytest-black pytestcov ]; + checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ]; # ironically, they fail a linting test, and pytest.ini forces that test suite checkPhase = '' rm backports/functools_lru_cache.py diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 0e8732f69a8f..02bdd0fc72ed 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytestcov }: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytest-cov }: buildPythonPackage rec { pname = "capturer"; diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index da04ecf68897..98d428cdbeba 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -5,7 +5,7 @@ # pythonPackages , click , pytest -, pytestcov +, pytest-cov , pytestrunner , pyyaml , six @@ -30,7 +30,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytestrunner ]; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index bec5f03cd88b..46fad656cabe 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -2,7 +2,7 @@ , fetchPypi , pytestCheckHook , coveralls -, pytestcov +, pytest-cov , cython , numpy , python @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook coveralls - pytestcov + pytest-cov ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 50f6d33791de..6e9256ffacfe 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -9,7 +9,7 @@ , portend , pyopenssl , pytestCheckHook -, pytestcov +, pytest-cov , pytest-mock , requests , requests-toolbelt @@ -46,7 +46,7 @@ buildPythonPackage rec { portend pyopenssl pytestCheckHook - pytestcov + pytest-cov pytest-mock requests requests-toolbelt diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index df50219fb170..82e878c83042 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchPypi , setuptools-scm , cheroot, contextlib2, portend, routes, six, zc_lockfile -, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt +, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests_toolbelt }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ - backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt + backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests_toolbelt ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 0b574e9114cf..b4fa2b8aeb45 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,7 +2,7 @@ , setuptools-scm , cheroot, portend, more-itertools, zc_lockfile, routes , jaraco_collections -, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services +, objgraph, pytest, pytest-cov, pathpy, requests_toolbelt, pytest-services , fetchpatch }: @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; checkInputs = [ - objgraph pytest pytestcov pathpy requests_toolbelt pytest-services + objgraph pytest pytest-cov pathpy requests_toolbelt pytest-services ]; # Keyboard interrupt ends test suite run diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index d829f43dc0d1..8aeb73bb25b2 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytest-cov }: buildPythonPackage rec { pname = "clickclick"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0"; }; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ flake8 click pyyaml six ]; # test_cli asserts on exact quoting style of output diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index b2a13cdbb654..de42f7284112 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPyPy -, pytest, pytestcov, pytest-mock, freezegun +, pytest, pytest-cov, pytest-mock, freezegun , jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests , python-slugify }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-a5pNcoguJDvgd6c5fQ8fdv5mzz35HzEV27UzDiFPpFc="; }; - checkInputs = [ pytest pytestcov pytest-mock freezegun ]; + checkInputs = [ pytest pytest-cov pytest-mock freezegun ]; propagatedBuildInputs = [ jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify ]; diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index eadc3eb32b1f..28e524a265ba 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -5,7 +5,7 @@ , tinycss2 , pytest , pytestrunner -, pytestcov +, pytest-cov , pytest-flake8 , pytest-isort }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index d7cf79f9d07c..ba27b633fefd 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , python -, dbus, dbus-python, pytest, pytestcov, pytest-asyncio, pytest-timeout +, dbus, dbus-python, pytest, pytest-cov, pytest-asyncio, pytest-timeout }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { dbus dbus-python pytest - pytestcov + pytest-cov pytest-asyncio pytest-timeout ]; diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index ed6007f87ed2..50b1a94c7795 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , pytest_xdist , pytest-django , mock @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest_xdist pytest-django mock diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 8ee903bedc2a..cbe5dfbaa70b 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -5,7 +5,7 @@ , mock , pygments , pytest -, pytestcov +, pytest-cov , pytest-django , python-dateutil , shortuuid @@ -40,7 +40,7 @@ buildPythonPackage rec { mock pygments # not explicitly declared in setup.py, but some tests require it pytest - pytestcov + pytest-cov pytest-django python-dateutil shortuuid diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 7afe92b4337b..e9a31b461fd6 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, pytest-cov, pytest }: buildPythonPackage rec { version = "1.2.0"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestcov pytest ]; + checkInputs = [ pytest-cov pytest ]; meta = with lib; { description = "Python library for parsing Dockerfile files"; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 6e14355c2934..05eb173c5599 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , pytest -, pytestcov +, pytest-cov , mock , Mako , decorator @@ -33,7 +33,7 @@ buildPythonPackage rec { pytest ''; - checkInputs = [ pytest pytestcov mock Mako ]; + checkInputs = [ pytest pytest-cov mock Mako ]; propagatedBuildInputs = [ decorator stevedore ]; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 7cddb324f3a1..72986e7bda1e 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, mock +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock , pytest_xdist, covCore, glibcLocales }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov mock pytest_xdist covCore diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix index 11b13d8325a0..c55bf52a6643 100644 --- a/pkgs/development/python-modules/easysnmp/default.nix +++ b/pkgs/development/python-modules/easysnmp/default.nix @@ -5,7 +5,7 @@ , net-snmp , openssl , pytest -, pytestcov +, pytest-cov , pytest-flake8 , pytest-sugar , termcolor @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-flake8 pytest-sugar termcolor diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 708c5c351ea0..9fd80ac6d677 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytestcov, pytest-xprocess, pytestcache }: +{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytest-cov, pytest-xprocess, pytestcache }: buildPythonPackage rec { pname = "Flask-Caching"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; - checkInputs = [ pytestCheckHook pytestcov pytest-xprocess pytestcache ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-xprocess pytestcache ]; disabledTests = [ # backend_cache relies on pytest-cache, which is a stale package from 2013 diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index cfcc4d362997..73b7eea6e63a 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -6,7 +6,7 @@ , requests_oauthlib , pytest , pytestrunner -, pytestcov +, pytest-cov , responses }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; - checkInputs = [ pytest pytestrunner pytestcov responses ]; + checkInputs = [ pytest pytestrunner pytest-cov responses ]; doCheck = false; # Otherwise: # ========================= no tests ran in 0.01 seconds ========================= # builder for '/nix/store/c8a58v6aa18zci08q2l53s12ywn8jqhq-python3.6-flickrapi-2.4.0.drv' failed with exit code 5 diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index ce2ead246f95..40ce524c6675 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook -, atpublic, psutil, pytestcov, sybil +, atpublic, psutil, pytest-cov, sybil }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ atpublic psutil ]; - checkInputs = [ pytestCheckHook pytestcov sybil ]; + checkInputs = [ pytestCheckHook pytest-cov sybil ]; # disable code coverage checks for all OS. Upstream does not enforce these # checks on Darwin, and code coverage cannot be improved downstream nor is it diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 758f988a2395..37ff849a3cb9 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , hyppo , matplotlib , networkx @@ -36,7 +36,7 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ]; disabledTests = [ "gridplot_outputs" ]; diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix index 7d43ce95a7e3..a7a418afa18c 100644 --- a/pkgs/development/python-modules/gunicorn/19.nix +++ b/pkgs/development/python-modules/gunicorn/19.nix @@ -2,7 +2,7 @@ , coverage , mock , pytest -, pytestcov +, pytest-cov , setuptools }: @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest mock pytestcov coverage ]; + checkInputs = [ pytest mock pytest-cov coverage ]; prePatch = '' substituteInPlace requirements_test.txt --replace "==" ">=" \ diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index c1f36c20566f..ba948a68915a 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -2,7 +2,7 @@ , coverage , mock , pytest -, pytestcov +, pytest-cov , setuptools }: @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest mock pytestcov coverage ]; + checkInputs = [ pytest mock pytest-cov coverage ]; prePatch = '' substituteInPlace requirements_test.txt --replace "==" ">=" \ diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 1d6d6b39d043..0852ce4d4430 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -9,7 +9,7 @@ , pandas , codecov , pytest -, pytestcov +, pytest-cov , pytestrunner , coveralls , twine @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; # incompatible with latest astropy checkInputs = [ - pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov + pytest pytest-cov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov ]; pythonImportsCheck = [ "hickle" ]; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index de2f9b00f538..c6c7b3372140 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -8,7 +8,7 @@ , pproxy , pytest-asyncio , pytestCheckHook -, pytestcov +, pytest-cov , sniffio , trio , trustme @@ -38,7 +38,7 @@ buildPythonPackage rec { pproxy pytest-asyncio pytestCheckHook - pytestcov + pytest-cov trio trustme uvicorn diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index b45c3e85f502..e5db065defcd 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -11,7 +11,7 @@ , pytestCheckHook , pytest-asyncio , pytest-trio -, pytestcov +, pytest-cov , trustme , uvicorn }: @@ -41,7 +41,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-trio - pytestcov + pytest-cov trustme uvicorn ]; diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 9fdeca082b2f..8dcca1983ba3 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy27 , fetchFromGitHub -, pytestCheckHook , pytestcov , numba +, pytestCheckHook , pytest-cov , numba , numpy , scikit-learn , scipy @@ -30,7 +30,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook pytestcov matplotlib seaborn ]; + checkInputs = [ pytestCheckHook pytest-cov matplotlib seaborn ]; disabledTestPaths = [ "docs" "benchmarks" diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index a63617ba2a2a..8e7f4832c254 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -5,7 +5,7 @@ , pyjwt , pylint , pytestCheckHook -, pytestcov +, pytest-cov , python-dateutil , requests , responses @@ -25,7 +25,7 @@ buildPythonPackage rec { codecov pylint pytestCheckHook - pytestcov + pytest-cov responses tox ]; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index e55fd8f39d55..84e381f0b8c8 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: +{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytest-cov, pexpect, pytest-mock }: buildPythonPackage rec { pname = "inquirer"; @@ -20,7 +20,7 @@ buildPythonPackage rec { --replace "readchar==2.0.1" "readchar>=2.0.0" ''; - checkInputs = [ pytest pytestcov pexpect pytest-mock ]; + checkInputs = [ pytest pytest-cov pexpect pytest-mock ]; checkPhase = '' pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index 0f0466c8b3eb..cc56f8d0bdea 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -3,7 +3,7 @@ , fetchPypi , flexmock , pytest -, pytestcov +, pytest-cov , six }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ flexmock pytest - pytestcov + pytest-cov six ]; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index a0efa9b575db..3f8811f4f3b4 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestcov +, pytest-cov , nbval , ipywidgets , numpy @@ -29,7 +29,7 @@ buildPythonPackage rec { traittypes ]; - checkInputs = [ pytest pytestcov nbval ]; + checkInputs = [ pytest pytest-cov nbval ]; checkPhase = "pytest ipydatawidgets/tests"; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 305b9f6c6b6b..0dba5e8f192c 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -14,7 +14,7 @@ buildPythonPackage rec { fetchSubmodules = true; }; - checkInputs = [ pytest glibcLocales tox pytestcov ]; + checkInputs = [ pytest glibcLocales tox pytest-cov ]; propagatedBuildInputs = [ parso ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 78aaadf690e2..7507789fd533 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, pytest, pytestrunner, pbr, glibcLocales , pytestcov +, pytest, pytestrunner, pbr, glibcLocales , pytest-cov , requests, requests_oauthlib, requests_toolbelt, defusedxml , ipython }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; }; - buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ]; + buildInputs = [ glibcLocales pytest pytest-cov pytestrunner pbr ]; propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index 82ddb3bf23a7..d16fa89a97c4 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 }: +, flake8, pep8-naming, pytest, pytest-cov }: buildPythonPackage rec { pname = "jsonlines"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ flake8 pep8-naming pytest pytestcov ]; + checkInputs = [ flake8 pep8-naming pytest pytest-cov ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 7f1a729b5b1a..f3f2b9dc32c1 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -10,7 +10,7 @@ , jupyter_server , openapi-core , pytest-tornasync -, pytestcov +, pytest-cov , ruamel-yaml , strict-rfc3339 }: diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index e90dd1a806aa..b6ac0a1fa132 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, pytest_xdist +, pytest, pytest-cov, pytest_xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing }: @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest_xdist ]; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 33710c6682dc..36918a484c3e 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - six, pytest, pytestrunner, pytestcov, coverage + six, pytest, pytestrunner, pytest-cov, coverage }: buildPythonPackage rec { pname = "libais"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # data files missing doCheck = false; - checkInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytestrunner pytest-cov coverage ]; propagatedBuildInputs = [ six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 01ff1458c0fa..decad482bef1 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, fetchFromGitHub, requests, iso8601, bottle, pytest, pytestcov }: +{ lib, buildPythonPackage, python, fetchFromGitHub, requests, iso8601, bottle, pytest, pytest-cov }: buildPythonPackage rec { pname = "m3u8"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0cmg993icpsa1b19kljxvjwhs167bsqrs0ad4wnwsi8qq6na5d4p"; }; - checkInputs = [ bottle pytest pytestcov ]; + checkInputs = [ bottle pytest pytest-cov ]; checkPhase = '' pytest tests/test_{parser,model,variant_m3u8}.py diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 94cfb637a15e..a7876a75e495 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, markdown, - pytest, pytestrunner, pytestcov, coverage }: + pytest, pytestrunner, pytest-cov, coverage }: buildPythonPackage rec { pname = "MarkdownSuperscript"; @@ -20,7 +20,7 @@ buildPythonPackage rec { sed 's/=.*//' -i requirements/*.txt ''; - checkInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytestrunner pytest-cov coverage ]; meta = with lib; { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index e3b629b3034e..aa2784cd1dbb 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -4,7 +4,7 @@ , marshmallow # Check Inputs , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; # setuptools check can run, but won't find tests - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; meta = with lib; { description = "An unofficial extension to Marshmallow to allow for polymorphic fields"; diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 77e6f9c24685..2dfe06d51770 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -5,7 +5,7 @@ , numpy , scipy , pytestCheckHook -, pytestcov +, pytest-cov , pytest-timeout , h5py , matplotlib @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest-timeout h5py matplotlib diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 555011a314d9..10cbc58eb8d8 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestCheckHook, pytestrunner, pytestcov +, pytestCheckHook, pytestrunner, pytest-cov , isPy3k }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"; }; - checkInputs = [ pytestCheckHook pytestrunner pytestcov ]; + checkInputs = [ pytestCheckHook pytestrunner pytest-cov ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 2eed1eefeec8..bffc4247632d 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub , requests, requests_oauthlib, six -, pytest, pytestcache, pytestcov, responses, mock +, pytest, pytestcache, pytest-cov, responses, mock }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj"; }; - checkInputs = [ pytest pytestcache pytestcov responses mock ]; + checkInputs = [ pytest pytestcache pytest-cov responses mock ]; propagatedBuildInputs = [ requests requests_oauthlib six ]; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index d475f21fcb51..e7a2a6808a8a 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , pytest -, pytestcov +, pytest-cov , pytest-mock , hypothesis , glibcLocales @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-mock hypothesis glibcLocales diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 221915efca03..96fc94d43e85 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -5,7 +5,7 @@ , attrs , py , setuptools -, pytestcov +, pytest-cov , pytest-timeout , pytest-tornado , mock @@ -34,7 +34,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis - pytestcov + pytest-cov pytest-timeout pytest-tornado jsonschema diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index b9a336f7fbe9..176986492555 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -11,7 +11,7 @@ , glibcLocales , matplotlib , sympy -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { pytestCheckHook matplotlib sympy - pytestcov + pytest-cov ]; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 078c455a6373..7ecba3b7d3b1 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -26,7 +26,7 @@ , simplejson , traits , xvfbwrapper -, pytestcov +, pytest-cov , codecov , sphinx # other dependencies @@ -94,7 +94,7 @@ buildPythonPackage rec { pytest pytest-forked pytest_xdist - pytestcov + pytest-cov which ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 597b6814281f..0821e0b763d0 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -6,7 +6,7 @@ , effect , git , pytestCheckHook -, pytestcov +, pytest-cov , pythonOlder }: @@ -29,7 +29,7 @@ buildPythonPackage rec { effect ]; - checkInputs = [ pytestCheckHook pytestcov git ]; + checkInputs = [ pytestCheckHook pytest-cov git ]; # ignore tests which are impure disabledTests = [ "network" "requires_nix_build" ]; diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index c2f484cb3a92..7d29428d93e6 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -1,5 +1,5 @@ { blinker, buildPythonPackage, fetchFromGitHub, lib, isPy27, six, mock, pytest -, webtest, pytestcov, pytest-django, pytest-pythonpath, flake8, sqlalchemy +, webtest, pytest-cov, pytest-django, pytest-pythonpath, flake8, sqlalchemy , flask_sqlalchemy, peewee }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { mock pytest webtest - pytestcov + pytest-cov pytest-django pytest-pythonpath flake8 diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index f09a42ddd69b..18e357c1f2d2 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -5,7 +5,7 @@ , isodate , jsonschema , pytest-flake8 -, pytestcov +, pytest-cov , rfc3339-validator , six , strict-rfc3339 @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; - checkInputs = [ pytestCheckHook pytestcov pytest-flake8 ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ]; pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index b431ef507525..4e61a86a5013 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, isPy27, fetchPypi , jsonschema, openapi-schema-validator, pyyaml, six, pathlib -, mock, pytest, pytestcov, pytest-flake8, tox, setuptools }: +, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools }: buildPythonPackage rec { pname = "openapi-spec-validator"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ] ++ (lib.optionals (isPy27) [ pathlib ]); - checkInputs = [ mock pytest pytestcov pytest-flake8 tox ]; + checkInputs = [ mock pytest pytest-cov pytest-flake8 tox ]; meta = with lib; { homepage = "https://github.com/p1c2u/openapi-spec-validator"; diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix index 872a54076125..f2dd196be942 100644 --- a/pkgs/development/python-modules/orm/default.nix +++ b/pkgs/development/python-modules/orm/default.nix @@ -5,7 +5,7 @@ , typesystem , aiosqlite , pytestCheckHook -, pytestcov +, pytest-cov , typing-extensions }: @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ aiosqlite pytestCheckHook - pytestcov + pytest-cov typing-extensions ]; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 9af09d569466..5b9a6d8e968b 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -19,7 +19,7 @@ , backports_tempfile , isPy27 , pytest -, pytestcov +, pytest-cov , pytest-mock }: @@ -54,7 +54,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-mock ]; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 3e7c6ae00116..72eb9a185d7a 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -3,7 +3,7 @@ , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , click, python-slugify, habanero, isbnlib, typing-extensions , prompt_toolkit, pygments, stevedore, tqdm, lxml -, python-doi, isPy3k, pytestcov +, python-doi, isPy3k, pytest-cov #, optional, dependencies , whoosh, pytest , stdenv @@ -43,7 +43,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; checkInputs = ([ - pytest pytestcov + pytest pytest-cov ]) ++ [ xdg-utils ]; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index 783d85b6c08c..7c08468c03f4 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytestcov, pytestCheckHook }: +{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytest-cov, pytestCheckHook }: buildPythonPackage rec { pname = "periodictable"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "52e925220005c20e97601e7b04ad6cebc271680947ab9adcbb1a796ddbaa0f23"; }; - checkInputs = [ pytestcov pytestCheckHook ]; + checkInputs = [ pytest-cov pytestCheckHook ]; meta = { homepage = "https://www.reflectometry.org/danse/software.html"; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 6a0f8940788c..8184c6d0d18a 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy3k , setuptools -, pytestcov +, pytest-cov , pytest }: @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; pythonImportsCheck = [ "pglast" ]; diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 8eab09046dc2..54a816643818 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -7,7 +7,7 @@ , attrs , espeak-ng , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonApplication rec { @@ -45,7 +45,7 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov ]; # We tried to package festvial, but were unable to get the backend running, diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 262bdceb5db7..75bc033807f6 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, fetchPypi, fetchpatch , plaster, PasteDeploy -, pytest, pytestcov +, pytest, pytest-cov }: buildPythonPackage rec { @@ -26,5 +26,5 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ plaster PasteDeploy ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; } diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 82aaebb10039..749ffdb7f321 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi -, pytest, pytestcov +, pytest, pytest-cov }: buildPythonPackage rec { @@ -15,5 +15,5 @@ buildPythonPackage rec { py.test ''; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; } diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index c37c428805eb..7287797ef331 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -13,7 +13,7 @@ , pkginfo , poetry-core , pytestCheckHook -, pytestcov +, pytest-cov , pytest-mock , requests , requests-toolbelt @@ -71,7 +71,7 @@ buildPythonPackage rec { "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" ''; - checkInputs = [ pytestCheckHook httpretty pytest-mock pytestcov ]; + checkInputs = [ pytestCheckHook httpretty pytest-mock pytest-cov ]; preCheck = "export HOME=$TMPDIR"; disabledTests = [ # touches network diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 7b4fc177bc11..8b642240f9cb 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytestCheckHook -, pytestcov +, pytest-cov , pytest-flake8 , pytest-mypy , redis diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index da27dd3cd922..d48f387400e4 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, setuptools-scm, tempora, pytest-black, pytestcov }: +, pytest, setuptools-scm, tempora, pytest-black, pytest-cov }: buildPythonPackage rec { pname = "portend"; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-black pytestcov ]; + checkInputs = [ pytest pytest-black pytest-cov ]; checkPhase = '' py.test --deselect=test_portend.py::TestChecker::test_check_port_listening diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index b13808f1a9db..783c936cf2d1 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -7,7 +7,7 @@ , six , semver , pytestCheckHook -, pytestcov +, pytest-cov , pytestrunner , openapi-spec-validator }: @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov openapi-spec-validator ]; diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index ad47163e4842..f50f9625fd96 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytest-cov }: buildPythonPackage rec { pname = "property-manager"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ coloredlogs humanfriendly verboselogs ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; meta = with lib; { description = "Useful property variants for Python programming"; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 01b249e1c77f..3a720bf328f3 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -2,7 +2,7 @@ , fonttools , lxml, fs # for fonttools extras , setuptools-scm -, pytestCheckHook, pytestcov, pytest_xdist +, pytestCheckHook, pytest-cov, pytest_xdist }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest_xdist ]; disabledTests = [ diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 2f494dcb7002..c333c3ea4fd1 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests -, prometheus_client, py-air-control, pytestCheckHook, pytestcov, pytestrunner +, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytestrunner , setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook pytestcov pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-cov pytestrunner ]; propagatedBuildInputs = [ flask prometheus_client py-air-control ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; }; diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix index 55f30f9e55a9..48686225e1ef 100644 --- a/pkgs/development/python-modules/pycategories/default.nix +++ b/pkgs/development/python-modules/pycategories/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , callPackage -, pytestcov +, pytest-cov , fetchPypi , lib , pytest @@ -24,7 +24,7 @@ buildPythonPackage rec { # and shouldn't be used in production code propagatedBuildInputs = [ (callPackage ./infix.nix { }) ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; meta = with lib; { homepage = "https://gitlab.com/danielhones/pycategories"; diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index f919ac21cb7b..acce4469eed4 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , future, python-language-server, mypy, configparser -, pytestCheckHook, mock, pytestcov, coverage +, pytestCheckHook, mock, pytest-cov, coverage , fetchpatch }: @@ -34,7 +34,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ mock pytestcov coverage pytestCheckHook ]; + checkInputs = [ mock pytest-cov coverage pytestCheckHook ]; propagatedBuildInputs = [ mypy python-language-server configparser diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index a6778a4aa7e8..80fa5bff3200 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -11,7 +11,7 @@ , pyflakes , pytest , pytestcache -, pytestcov +, pytest-cov , covCore , pytest-flakes , sphinx @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; checkInputs = [ - flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore + flask httpretty oauthlib pyflakes pytest pytestcache pytest-cov covCore pytest-flakes sphinx mock chalice ]; diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index 963e621986cf..acc555035822 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -3,7 +3,7 @@ , fetchPypi , fetchpatch , pytest -, pytestcov +, pytest-cov , pytestCheckHook , numpy , astropy @@ -37,7 +37,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov numpy scipy h5py diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 39d6bc127e6b..eea6c61a7274 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -7,7 +7,7 @@ , pytest , pytestcache , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { mock pytestCheckHook pytestcache - pytestcov + pytest-cov ]; pytestFlagsArray = [ "--ignore=docs" ]; diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 148b2c7185fb..df152eaa5eca 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestcov +, pytest-cov , pytest-doctestplus , pytestCheckHook , setuptools-scm @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest-doctestplus - pytestcov + pytest-cov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 0483063c53bc..e43a837d6aa4 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,5 +1,5 @@ { lib, isPyPy, buildPythonPackage, fetchPypi -, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; checkPhase = '' py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 8c59b6ee2c9c..40f67eb0b0ba 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -4,7 +4,7 @@ , pytest , pytestCheckHook , pexpect -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook pexpect pytestcov ]; + checkInputs = [ pytestCheckHook pexpect pytest-cov ]; disabledTests = [ "test_suppresses_timeout_when_pdb_is_entered" diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 8ea981ba2e7a..c4a66cc48e5d 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: +, pytest, pytest-cov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: buildPythonPackage rec { pname = "pytest-virtualenv"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12"; }; - checkInputs = [ pytest pytestcov mock cmdline ]; + checkInputs = [ pytest pytest-cov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; checkPhase = "py.test tests/unit "; diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index c8f1179bc66b..861addf81eef 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytest-cov }: buildPythonPackage rec { pname = "python-hosts"; @@ -15,7 +15,7 @@ buildPythonPackage rec { substituteInPlace python_hosts/utils.py --replace "import win_inet_pton" "" ''; - checkInputs = [ pyyaml pytest pytestcov ]; + checkInputs = [ pyyaml pytest pytest-cov ]; # Removing 1 test file (it requires internet connection) and keeping the other two checkPhase = '' diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index e641a943f865..a6d0bf800ea6 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytestCheckHook, mock, pytestcov, coverage +, pytestCheckHook, mock, pytest-cov, coverage , future, futures ? null, ujson, isPy38 }: @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; checkInputs = [ - pytestCheckHook mock pytestcov coverage + pytestCheckHook mock pytest-cov coverage ]; propagatedBuildInputs = [ future ujson ] diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 3ed9b75ef91f..f022eba58571 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast, pythonOlder, isPy27 , backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8 -, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky +, pytestCheckHook, mock, pytest-cov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] # The following packages are optional and @@ -55,7 +55,7 @@ buildPythonPackage rec { doCheck = providers == ["*"]; checkInputs = [ - pytestCheckHook mock pytestcov coverage flaky + pytestCheckHook mock pytest-cov coverage flaky # Do not propagate flake8 or it will enable pyflakes implicitly flake8 # rope is technically a dependency, but we don't add it by default since we diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index 95208c7b94b6..901a368d5d85 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -6,7 +6,7 @@ , pkgconfig , psutil , pytest -, pytestcov +, pytest-cov , pytestrunner , setuptools-scm }: @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ]; - checkInputs = [ pytest pytestcov psutil ]; + checkInputs = [ pytest pytest-cov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; # give a hint to setuptools-scm on package version diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index c27923424872..ccac3e8b3cb2 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestcov +, pytest-cov , mock , pyyaml , six @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov mock pyyaml ]; diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 3a3e9bced050..e06afb02165b 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, lib, fetchPypi, numpy -, pydantic, pint, networkx, pytestrunner, pytestcov, pytest +, pydantic, pint, networkx, pytestrunner, pytest-cov, pytest } : buildPythonPackage rec { pname = "qcelemental"; version = "0.21.0"; - checkInputs = [ pytestrunner pytestcov pytest ]; + checkInputs = [ pytestrunner pytest-cov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 847eeb23c9a1..793e1ada739e 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, lib, fetchPypi, pyyaml, qcelemental, pydantic -, py-cpuinfo, psutil, pytestrunner, pytest, pytestcov +, py-cpuinfo, psutil, pytestrunner, pytest, pytest-cov } : buildPythonPackage rec { @@ -8,7 +8,7 @@ buildPythonPackage rec { checkInputs = [ pytestrunner - pytestcov + pytest-cov pytest ]; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 85d5d5d0b7d8..1ec6448d74c1 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, lib, fetchFromGitHub, isPy3k , cython, setuptools , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pytestcov, packaging, hypothesis, boto3, mock +, pytest, pytest-cov, packaging, hypothesis, boto3, mock , certifi, shapely }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc="; }; - checkInputs = [ boto3 pytest pytestcov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ boto3 pytest pytest-cov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ cython gdal ]; propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index ea13c7083fe7..c83a2bba1cd6 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: +{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytest-cov, pexpect }: buildPythonPackage rec { pname = "readchar"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ flake8 ]; - checkInputs = [ pytest pytestcov pexpect ]; + checkInputs = [ pytest pytest-cov pexpect ]; meta = with lib; { homepage = "https://github.com/magmax/python-readchar"; diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 896bc8e02f09..873a39244fe3 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -2,7 +2,7 @@ , fetchPypi , buildPythonPackage , sphinx -, pytestcov +, pytest-cov , pytest , Mako , numpy @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7"; }; - checkInputs = [ sphinx pytestcov pytest ]; + checkInputs = [ sphinx pytest-cov pytest ]; propagatedBuildInputs = [ Mako numpy funcsigs ] ++ lib.optional withCuda pycuda diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 551c7f5b93e6..e7e7ed5a7381 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest -, pytestcov +, pytest-cov , numpy , scipy , cython @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0qmkxl5sbgh0j73n667vyi7ywzh09iaync91yp1j5rrcmwsn0qfs"; }; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ numpy scipy cython numba six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index eb9afc8353c7..03aed296aa63 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , dill , numpy , pytorch @@ -25,7 +25,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ]; - checkInputs = [ dill pytestcov pytestCheckHook ]; + checkInputs = [ dill pytest-cov pytestCheckHook ]; disabledTests = [ "test_affine" ]; # deprecated division operator '/' diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index c47054632c6f..4e062d9928ec 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -20,7 +20,7 @@ , wget , deepdiff , pytestCheckHook -, pytestcov +, pytest-cov , websocket-client }: @@ -61,7 +61,7 @@ buildPythonPackage rec { checkInputs = [ deepdiff pytestCheckHook - pytestcov + pytest-cov websocket-client ]; diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 7f3e6527d060..5f0653236acf 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -6,7 +6,7 @@ , pytest , requests-mock , mock -, pytestcov +, pytest-cov , pytest-timeout , testtools }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml requests ]; - checkInputs = [ pytest requests-mock mock pytestcov pytest-timeout testtools ]; + checkInputs = [ pytest requests-mock mock pytest-cov pytest-timeout testtools ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 6694c3abe4df..3a3feaa14edc 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -15,7 +15,7 @@ , ninja , pathpy , pytest -, pytestcov +, pytest-cov , pytest-mock , pytestrunner , pytest-virtualenv @@ -48,7 +48,7 @@ buildPythonPackage rec { ninja pathpy pytest - pytestcov + pytest-cov pytest-mock pytestrunner pytest-virtualenv diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index f9f896a563b7..643afd6dc8bf 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: +{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytest-cov, pytest-mock, fake-useragent, faker, scrapy }: buildPythonPackage rec { pname = "scrapy-fake-useragent"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fake-useragent faker ]; - checkInputs = [ pytestCheckHook scrapy pytestcov pytest-mock ]; + checkInputs = [ pytestCheckHook scrapy pytest-cov pytest-mock ]; meta = with lib; { description = "Random User-Agent middleware based on fake-useragent"; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index db3b8ed4312c..3bbf28d2884e 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestCheckHook , pytest -, pytestcov +, pytest-cov , flaky , numpy , pandas @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ]; - checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; + checkInputs = [ pytest pytest-cov flaky pandas pytestCheckHook ]; disabledTests = [ # on CPU, these expect artifacts from previous GPU run diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 3c2a5e2a356d..78ecb3face30 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -9,7 +9,7 @@ , pygments , urllib3 , pytest -, pytestcov +, pytest-cov , mock , sphinx , testtools @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; - checkInputs = [ pytest pytestcov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; + checkInputs = [ pytest pytest-cov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index cfdc173995c3..a0b5c9799254 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytestcov, pytest-mock, pytest_xdist }: +{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest_xdist }: buildPythonPackage rec { pname = "stripe"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ]; + checkInputs = [ pytest pytest-cov pytest-mock pytest_xdist ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix index 35aaf45ed1a2..97a7d6ebbdda 100644 --- a/pkgs/development/python-modules/stups-cli-support/default.nix +++ b/pkgs/development/python-modules/stups-cli-support/default.nix @@ -5,7 +5,7 @@ , dnspython , requests , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 5f51112324aa..8628c83334ba 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -5,7 +5,7 @@ , stups-cli-support , stups-zign , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -33,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index aaa049916411..92cd344edb6d 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -5,7 +5,7 @@ , stups-cli-support , stups-zign , pytest -, pytestcov +, pytest-cov , hypothesis , isPy3k }: @@ -34,7 +34,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov hypothesis ]; diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix index 3e785d8febbe..62dec6f348e8 100644 --- a/pkgs/development/python-modules/stups-tokens/default.nix +++ b/pkgs/development/python-modules/stups-tokens/default.nix @@ -4,7 +4,7 @@ , requests , mock , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index 6b80f55636a9..e7f6c2805de5 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -5,7 +5,7 @@ , stups-tokens , stups-cli-support , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index cedbb7bcf786..fe92b71f3f52 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -19,7 +19,7 @@ , vcrpy , pytest , pytest-flakes -, pytestcov +, pytest-cov , pytestrunner }: @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ sympy vcrpy pytest pytest-flakes - pytestcov pytestrunner + pytest-cov pytestrunner ]; # https://github.com/Diaoul/subliminal/pull/963 diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index c8fd82043a81..0079b44cfd35 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -19,7 +19,7 @@ , parfive , pytest-astropy , pytest-mock -, pytestcov +, pytest-cov , python-dateutil , scikitimage , scipy @@ -68,7 +68,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis pytest-astropy - pytestcov + pytest-cov pytest-mock ]; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index b6754e15ad5d..404edac7e59b 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -4,7 +4,7 @@ , pandas , setuptools-scm , pytest -, pytestcov +, pytest-cov , pyyaml , unicodecsv , xlrd @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; - checkInputs = [ pytest pytestcov unicodecsv pandas ]; + checkInputs = [ pytest pytest-cov unicodecsv pandas ]; # test_tablib needs MarkupPy, which isn't packaged yet checkPhase = '' diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index b06a53cb333c..8da8d622a7b3 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock , six, pytz, jaraco_functools, pythonOlder -, pytest-flake8, pytestcov, pytest-black, pytest-mypy +, pytest-flake8, pytest-cov, pytest-black, pytest-mypy }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest-freezegun pytest freezegun backports_unittest-mock - pytest-flake8 pytestcov pytest-black pytest-mypy + pytest-flake8 pytest-cov pytest-black pytest-mypy ]; checkPhase = '' diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix index 791479b69e14..995a62230b22 100644 --- a/pkgs/development/python-modules/textwrap3/default.nix +++ b/pkgs/development/python-modules/textwrap3/default.nix @@ -4,7 +4,7 @@ , tox , pytest , coverage -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { tox pytest coverage - pytestcov + pytest-cov ]; checkPhase = '' diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index fb2c6094b37c..20fad7c18a0a 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , flit , pytestCheckHook -, pytestcov +, pytest-cov , numpy , scipy }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df"; }; - checkInputs = [ pytestCheckHook pytestcov numpy scipy ]; + checkInputs = [ pytestCheckHook pytest-cov numpy scipy ]; meta = with lib; { homepage = "https://github.com/joblib/threadpoolctl"; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 48aff396aaad..1cd055588c28 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -5,7 +5,7 @@ , numba , numpy , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ numba pytestCheckHook pytestcov ]; + checkInputs = [ numba pytestCheckHook pytest-cov ]; meta = with lib; { description = "fast python package for finding the timezone of any point on earth (coordinates) offline"; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 35c0f76b0843..7a025577dbb0 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -7,7 +7,7 @@ # Check inputs , pytest , pytestrunner -, pytestcov +, pytest-cov , pytest-flake8 , pytest-isort }: @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webencodings ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; # https://github.com/PyCQA/pycodestyle/issues/598 preCheck = '' diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index d8225e7031ea..fb39831a0d18 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder, click , click-completion, factory_boy, faker, inquirer, notify-py, pbr, pendulum -, ptable, pytestCheckHook, pytestcov, pytest-mock, requests, twine +, ptable, pytestCheckHook, pytest-cov, pytest-mock, requests, twine , validate-email }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pbr twine ]; - checkInputs = [ pbr pytestCheckHook pytestcov pytest-mock faker factory_boy ]; + checkInputs = [ pbr pytestCheckHook pytest-cov pytest-mock faker factory_boy ]; preCheck = '' export TOGGL_API_TOKEN=your_api_token diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 61adcf9254ff..13d037515c3f 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -4,7 +4,7 @@ , click , pytestCheckHook , shellingham -, pytestcov +, pytest-cov , pytest_xdist , pytest-sugar , coverage @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest_xdist pytest-sugar shellingham diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index ef3b1c78c399..a4d8125b5d61 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , colorama , pytest -, pytestcov +, pytest-cov }: buildPythonPackage { @@ -19,7 +19,7 @@ buildPythonPackage { }; propagatedBuildInputs = [ colorama ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index c278680404ba..f7dcf33ea7fd 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy27 , pytestCheckHook -, pytestcov +, pytest-cov , jinja2 , pyyaml }: @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov ]; disabledTests = [ diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 32a877582342..4d7fe6b034b4 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -7,7 +7,7 @@ , astunparse , typing-extensions , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { } )]; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ]; # Tests must be run from outside the source directory diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 82e291ae4623..f13bd4cbdc43 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38"; }; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 8f946c47786d..c578b7c7c8c0 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -16,7 +16,7 @@ pytestrunner, pytest-isort, pytest-flake8, - pytestcov, + pytest-cov, isPy3k, substituteAll }: @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501' ''; - checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytestcov ]; + checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytest-cov ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index b078231c9429..1272916d41f7 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -9,7 +9,7 @@ , setuptools-scm , gcc , pytest -, pytestcov +, pytest-cov , isPy27 }: let @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cython numpy scikit-learn six ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; # Checks require test data downloaded separately # See project source Makefile:test-data rule for reference diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index 80f22efbda85..e04f17c214df 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -4,7 +4,7 @@ , numpy , pillow , cython -, pytestcov +, pytest-cov , pytest , fetchpatch }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy pillow ]; # Tests require extra dependencies - checkInputs = [ mock pytest pytestcov ]; + checkInputs = [ mock pytest pytest-cov ]; checkPhase = '' PATH=$out/bin:$PATH pytest test diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix index 2e1ca55dad3f..93650c9027a4 100644 --- a/pkgs/development/tools/sourcetrail/jedi.nix +++ b/pkgs/development/tools/sourcetrail/jedi.nix @@ -1,6 +1,6 @@ # Taken from a past commit of nixpkgs -{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20"; }; - checkInputs = [ pytest glibcLocales tox pytestcov ]; + checkInputs = [ pytest glibcLocales tox pytest-cov ]; propagatedBuildInputs = [ parso ]; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index fcab1f952f2b..a6d28b36bffd 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. disabled = ! pythonAtLeast "3.5"; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools ]; # Unpin test dependency versions. This is fixed in master but not yet released. diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index e65021599ad4..8774715bb1d8 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { asynctest unittest-data-provider pytest - pytestcov + pytest-cov pytest-aiohttp ]; diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 6c105cf9b335..7737205ce02d 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -65,7 +65,7 @@ buildPythonApplication rec { checkInputs = [ mock pytest - pytestcov + pytest-cov pytest_xdist vcrpy ]; diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index 25d3eaa15fc8..31cb2861f39f 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { buildInputs = with python3Packages; [ setuptools setuptools-scm salt ]; checkInputs = with python3Packages; [ - pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado + pytest mock pyzmq pytest-rerunfailures pytest-cov cherrypy tornado ]; meta = with lib; { diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index c167ad1fa018..aae6ce329f68 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytestcov, pytestrunner, lib, stringcase +, pytest-cov, pytestrunner, lib, stringcase }: buildPythonApplication rec { @@ -15,7 +15,7 @@ buildPythonApplication rec { hypothesis mypy pytest - pytestcov + pytest-cov ]; buildInputs = [ diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 03e76e5fb275..b5b1256a9b5e 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { 'from pygit2 import RemoteCallbacks' ''; - checkInputs = with python3Packages; [ pytest pytestcov mock ]; + checkInputs = with python3Packages; [ pytest pytest-cov mock ]; propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ]; checkPhase = "py.test"; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index a3f1608c3ad1..f71d8a8b8ef3 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { --replace "data_files = *.rst, *.txt" "" ''; - buildInputs = [ httpretty pytest pytestcov ]; + buildInputs = [ httpretty pytest pytest-cov ]; preCheck = '' # fix compatibility with pytest 4 diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index d49c1e925dc1..037adda92eb6 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ freezegun pytest - pytestcov + pytest-cov pytest-flake8 ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 017d27a8a208..f42713fee3db 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -52,6 +52,7 @@ mapAliases ({ privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4654534e6c9..f689a562a49d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6786,8 +6786,7 @@ in { pytest-console-scripts = callPackage ../development/python-modules/pytest-console-scripts { }; - pytest-cov = self.pytestcov; # self 2021-01-04 - pytestcov = callPackage ../development/python-modules/pytest-cov { }; + pytest-cov = callPackage ../development/python-modules/pytest-cov { }; pytest-cram = callPackage ../development/python-modules/pytest-cram { }; From 9bfdf57e139e7e3b253979da828285bb8284a217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:07:53 +0200 Subject: [PATCH 02/11] pythonPackages: deprecate pytestrunner alias --- pkgs/applications/misc/pyditz/cerberus.nix | 4 ++-- pkgs/applications/networking/dyndns/dyndnsc/default.nix | 2 +- .../networking/instant-messengers/matrixcli/default.nix | 4 ++-- pkgs/applications/office/todoman/default.nix | 2 +- pkgs/applications/terminal-emulators/terminator/default.nix | 2 +- pkgs/applications/version-management/nbstripout/default.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 4 ++-- pkgs/development/python-modules/aiocontextvars/default.nix | 4 ++-- pkgs/development/python-modules/apprise/default.nix | 4 ++-- pkgs/development/python-modules/arpeggio/default.nix | 4 ++-- pkgs/development/python-modules/awkward0/default.nix | 4 ++-- pkgs/development/python-modules/bacpypes/default.nix | 4 ++-- pkgs/development/python-modules/bleach/default.nix | 4 ++-- pkgs/development/python-modules/cairocffi/0_9.nix | 2 +- pkgs/development/python-modules/cairocffi/default.nix | 2 +- pkgs/development/python-modules/cairocffi/generic.nix | 2 +- pkgs/development/python-modules/cfn-flip/default.nix | 4 ++-- pkgs/development/python-modules/chardet/2.nix | 4 ++-- pkgs/development/python-modules/ci-py/default.nix | 4 ++-- pkgs/development/python-modules/coveralls/default.nix | 4 ++-- pkgs/development/python-modules/cssselect2/default.nix | 4 ++-- pkgs/development/python-modules/daphne/default.nix | 4 ++-- pkgs/development/python-modules/defcon/default.nix | 4 ++-- pkgs/development/python-modules/diceware/default.nix | 4 ++-- pkgs/development/python-modules/django_guardian/default.nix | 4 ++-- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- pkgs/development/python-modules/fastpair/default.nix | 4 ++-- pkgs/development/python-modules/fastparquet/default.nix | 4 ++-- pkgs/development/python-modules/favicon/default.nix | 4 ++-- pkgs/development/python-modules/ffmpeg-python/default.nix | 4 ++-- pkgs/development/python-modules/flake8/default.nix | 4 ++-- pkgs/development/python-modules/flickrapi/default.nix | 4 ++-- pkgs/development/python-modules/fontmath/default.nix | 4 ++-- pkgs/development/python-modules/genanki/default.nix | 4 ++-- pkgs/development/python-modules/gidgethub/default.nix | 4 ++-- pkgs/development/python-modules/grandalf/default.nix | 4 ++-- pkgs/development/python-modules/guessit/default.nix | 4 ++-- pkgs/development/python-modules/hickle/default.nix | 4 ++-- pkgs/development/python-modules/image-match/default.nix | 4 ++-- pkgs/development/python-modules/inform/default.nix | 4 ++-- pkgs/development/python-modules/jira/default.nix | 4 ++-- pkgs/development/python-modules/keyutils/default.nix | 4 ++-- pkgs/development/python-modules/libais/default.nix | 4 ++-- pkgs/development/python-modules/libcloud/2.nix | 4 ++-- pkgs/development/python-modules/libcloud/default.nix | 4 ++-- pkgs/development/python-modules/lomond/default.nix | 4 ++-- pkgs/development/python-modules/lyricwikia/default.nix | 4 ++-- pkgs/development/python-modules/marisa-trie/default.nix | 4 ++-- .../python-modules/markdownsuperscript/default.nix | 4 ++-- pkgs/development/python-modules/matchpy/default.nix | 4 ++-- pkgs/development/python-modules/matrix-client/default.nix | 4 ++-- pkgs/development/python-modules/mccabe/default.nix | 4 ++-- pkgs/development/python-modules/measurement/default.nix | 4 ++-- pkgs/development/python-modules/multidict/default.nix | 4 ++-- pkgs/development/python-modules/multiset/default.nix | 4 ++-- .../development/python-modules/mwparserfromhell/default.nix | 4 ++-- pkgs/development/python-modules/ndjson/default.nix | 4 ++-- pkgs/development/python-modules/numpy-stl/default.nix | 4 ++-- pkgs/development/python-modules/omegaconf/default.nix | 4 ++-- pkgs/development/python-modules/packet-python/default.nix | 6 +++--- pkgs/development/python-modules/paho-mqtt/default.nix | 4 ++-- pkgs/development/python-modules/parse-type/default.nix | 4 ++-- pkgs/development/python-modules/parsedatetime/default.nix | 4 ++-- pkgs/development/python-modules/paste/default.nix | 4 ++-- pkgs/development/python-modules/pastedeploy/default.nix | 4 ++-- pkgs/development/python-modules/prance/default.nix | 4 ++-- pkgs/development/python-modules/praw/6.3.nix | 4 ++-- .../python-modules/py-air-control-exporter/default.nix | 4 ++-- pkgs/development/python-modules/py-multibase/default.nix | 4 ++-- pkgs/development/python-modules/pycategories/default.nix | 4 ++-- pkgs/development/python-modules/pydicom/default.nix | 4 ++-- pkgs/development/python-modules/pyee/default.nix | 4 ++-- pkgs/development/python-modules/pygal/default.nix | 4 ++-- pkgs/development/python-modules/pylint/1.9.nix | 4 ++-- pkgs/development/python-modules/pymatgen-lammps/default.nix | 4 ++-- pkgs/development/python-modules/pynvim/default.nix | 4 ++-- pkgs/development/python-modules/pyosf/default.nix | 4 ++-- pkgs/development/python-modules/pysrim/default.nix | 4 ++-- pkgs/development/python-modules/pytest-pylint/default.nix | 4 ++-- .../python-modules/{pytestrunner => pytest-runner}/2.nix | 0 .../{pytestrunner => pytest-runner}/default.nix | 0 pkgs/development/python-modules/python-lz4/default.nix | 4 ++-- pkgs/development/python-modules/python-twitter/default.nix | 4 ++-- pkgs/development/python-modules/pythran/default.nix | 4 ++-- pkgs/development/python-modules/pyvips/default.nix | 4 ++-- pkgs/development/python-modules/qcelemental/default.nix | 4 ++-- pkgs/development/python-modules/qcengine/default.nix | 4 ++-- pkgs/development/python-modules/rebulk/default.nix | 4 ++-- pkgs/development/python-modules/reflink/default.nix | 4 ++-- pkgs/development/python-modules/scikit-build/default.nix | 4 ++-- pkgs/development/python-modules/secp256k1/default.nix | 4 ++-- pkgs/development/python-modules/setuptoolstrial/default.nix | 4 ++-- pkgs/development/python-modules/slackclient/default.nix | 4 ++-- pkgs/development/python-modules/sqlite-utils/default.nix | 4 ++-- pkgs/development/python-modules/srptools/default.nix | 4 ++-- pkgs/development/python-modules/ssdeep/default.nix | 4 ++-- pkgs/development/python-modules/sseclient/default.nix | 4 ++-- pkgs/development/python-modules/stone/default.nix | 4 ++-- pkgs/development/python-modules/subliminal/default.nix | 4 ++-- pkgs/development/python-modules/tatsu/default.nix | 4 ++-- pkgs/development/python-modules/tinycss2/default.nix | 4 ++-- pkgs/development/python-modules/token-bucket/default.nix | 4 ++-- pkgs/development/python-modules/torchgpipe/default.nix | 4 ++-- pkgs/development/python-modules/variants/default.nix | 4 ++-- pkgs/development/python-modules/weasyprint/default.nix | 4 ++-- pkgs/development/python-modules/yarl/default.nix | 4 ++-- pkgs/development/tools/analysis/cpplint/default.nix | 2 +- pkgs/development/tools/asn2quickder/default.nix | 4 ++-- pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | 4 +--- pkgs/misc/flashfocus/default.nix | 2 +- pkgs/servers/dns/doh-proxy/default.nix | 2 +- pkgs/servers/radicale/2.x.nix | 2 +- pkgs/tools/backup/duplicity/default.nix | 2 +- pkgs/tools/backup/zfs-replicate/default.nix | 4 ++-- pkgs/tools/misc/yle-dl/default.nix | 2 +- pkgs/tools/security/sequoia/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 3 +-- pkgs/top-level/python2-packages.nix | 2 +- 120 files changed, 218 insertions(+), 220 deletions(-) rename pkgs/development/python-modules/{pytestrunner => pytest-runner}/2.nix (100%) rename pkgs/development/python-modules/{pytestrunner => pytest-runner}/default.nix (100%) diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index 5eb43c0e3575..0e473c6a1ba1 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest-runner, pytest }: buildPythonPackage rec { pname = "Cerberus"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; }; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; meta = with lib; { homepage = "http://python-cerberus.org/"; diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 66b1d2639d68..07854f48fcc6 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace setup.py --replace "bottle==" "bottle>=" ''; - nativeBuildInputs = with python3Packages; [ pytestrunner ]; + nativeBuildInputs = with python3Packages; [ pytest-runner ]; propagatedBuildInputs = with python3Packages; [ daemonocle dnspython diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index aadb18606e11..7e88a77193b6 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,6 +1,6 @@ { lib, fetchgit , buildPythonApplication, buildPythonPackage - , pygobject3, pytestrunner, requests, responses, pytest, python-olm + , pygobject3, pytest-runner, requests, responses, pytest, python-olm , canonicaljson, olm }: let @@ -20,7 +20,7 @@ let propagatedBuildInputs = [ requests responses olm python-olm canonicaljson - pytestrunner pytest + pytest-runner pytest ]; doCheck = false; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 83bbc6cf53f9..fc9f70094da1 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { freezegun hypothesis pytest - pytestrunner + pytest-runner pytest-cov glibcLocales ]; diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 6ddeffe68eb8..e922a34423c0 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { intltool gobject-introspection wrapGAppsHook - python3.pkgs.pytestrunner + python3.pkgs.pytest-runner ]; buildInputs = [ diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 06a4b2c98a69..5e556b40a890 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { # application, it would mess up the Python environment. Thus, don't add it # here, instead add it to PATH when running unit tests checkInputs = [ pytest pytest-flake8 git ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ ipython nbformat ]; src = fetchPypi { diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 4bdad5f7c61c..7df426177483 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens , pycryptodome, pytest_xdist, pytest-cov, recommonmark, semantic-version, sphinx -, sphinx_rtd_theme, pytestrunner }: +, sphinx_rtd_theme, pytest-runner }: let sample-contract = writeText "example.vy" '' @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "e763561a161c35c03b92a0c176096dd9b4c78ab003c2f08324d443f459b3de84"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 728f2b5fa61a..dc70baab9e5c 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , pytest , pytest-asyncio , contextvars @@ -23,7 +23,7 @@ buildPythonPackage rec { }; buildInputs = [ - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 1bf5a93130dd..04a3e11be3ef 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, installShellFiles , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography -, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp +, pytest-runner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestrunner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp + pytest-runner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp ]; disabledTests = [ "test_apprise_cli_nux_env" ]; diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 97718a300693..5ad433413ce7 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , glibcLocales -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -19,7 +19,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix index 3783f9776cd1..ce9f1eabc77a 100644 --- a/pkgs/development/python-modules/awkward0/default.nix +++ b/pkgs/development/python-modules/awkward0/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , numpy -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index e07b02a08e74..8a1e6771b114 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, fetchFromGitHub -, wheel, pytestCheckHook, pytestrunner, pythonAtLeast }: +, wheel, pytestCheckHook, pytest-runner, pythonAtLeast }: buildPythonPackage rec { version = "0.18.4"; @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wheel ]; # Using pytes instead of setuptools check hook allows disabling specific tests - checkInputs = [ pytestCheckHook pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-runner ]; dontUseSetuptoolsCheck = true; disabledTests = [ # Test fails with a an error: AssertionError: assert 30 == 31 diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 53319466d3a5..d68318355d88 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestrunner +, pytest-runner , six , html5lib , setuptools @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM="; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ packaging six html5lib setuptools ]; # Disable network tests diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/pkgs/development/python-modules/cairocffi/0_9.nix index bd7bde42901e..84c1767bc29f 100644 --- a/pkgs/development/python-modules/cairocffi/0_9.nix +++ b/pkgs/development/python-modules/cairocffi/0_9.nix @@ -8,7 +8,7 @@ , makeFontsConf , freefont_ttf , pytest -, pytestrunner +, pytest-runner , glibcLocales , cairo , cffi diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 5c561af2f172..9b64dbeb66c1 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -8,7 +8,7 @@ , makeFontsConf , freefont_ttf , pytest -, pytestrunner +, pytest-runner , glibcLocales , cairo , cffi diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix index 8b674f3baaa8..cdcdbad3395d 100644 --- a/pkgs/development/python-modules/cairocffi/generic.nix +++ b/pkgs/development/python-modules/cairocffi/generic.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ numpy pytest pytestrunner glibcLocales ]; + checkInputs = [ numpy pytest pytest-runner glibcLocales ]; propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; checkPhase = '' diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index 98d428cdbeba..bf3eab19d4fa 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -6,7 +6,7 @@ , click , pytest , pytest-cov -, pytestrunner +, pytest-runner , pyyaml , six }: @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-cov - pytestrunner + pytest-runner ]; checkPhase = '' diff --git a/pkgs/development/python-modules/chardet/2.nix b/pkgs/development/python-modules/chardet/2.nix index 65381d40268f..5f6fe0a672a7 100644 --- a/pkgs/development/python-modules/chardet/2.nix +++ b/pkgs/development/python-modules/chardet/2.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, fetchpatch -, pytest, pytestrunner, hypothesis }: +, pytest, pytest-runner, hypothesis }: buildPythonPackage rec { pname = "chardet"; @@ -18,7 +18,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytest pytestrunner hypothesis ]; + checkInputs = [ pytest pytest-runner hypothesis ]; meta = with lib; { homepage = "https://github.com/chardet/chardet"; diff --git a/pkgs/development/python-modules/ci-py/default.nix b/pkgs/development/python-modules/ci-py/default.nix index 30220b48b72d..61e1760f3727 100644 --- a/pkgs/development/python-modules/ci-py/default.nix +++ b/pkgs/development/python-modules/ci-py/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, pytest, pytestrunner, pytestCheckHook }: +, pytest, pytest-runner, pytestCheckHook }: buildPythonPackage rec { version = "1.0.0"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "12ax07n81vxbyayhwzi1q6x7gfmwmvrvwm1n4ii6qa6fqlp9pzj7"; }; - nativeBuildInputs = [ pytestrunner ]; # pytest-runner included in setup-requires + nativeBuildInputs = [ pytest-runner ]; # pytest-runner included in setup-requires checkInputs = [ pytest pytestCheckHook ]; pythonImportsCheck = [ "ci" ]; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 5d5b07ffd05e..109667582188 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -4,7 +4,7 @@ , isPy27 , mock , pytest -, pytestrunner +, pytest-runner , sh , coverage , docopt @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; buildInputs = [ - pytestrunner + pytest-runner ]; postPatch = '' diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 28e524a265ba..25bb35eab2d8 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -4,7 +4,7 @@ , fetchPypi , tinycss2 , pytest -, pytestrunner +, pytest-runner , pytest-cov , pytest-flake8 , pytest-isort @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index f6d7fcac62a5..90b108e3bc74 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub -, asgiref, autobahn, twisted, pytestrunner +, asgiref, autobahn, twisted, pytest-runner , hypothesis, pytest, pytest-asyncio, service-identity, pyopenssl }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI="; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ asgiref autobahn twisted service-identity pyopenssl ]; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 100c7ee6fc1f..30853aa41a64 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , fonttools, setuptools-scm -, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens +, pytest, pytest-runner, lxml, fs, unicodedata2, fontpens }: buildPythonPackage rec { @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestrunner + pytest-runner lxml fs unicodedata2 diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index 8e35eabfb0d7..d519aa76c8b1 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytestrunner +, pytest-runner , setuptools , coverage, pytest }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 0e3eaff6cb57..9685e55bb1c3 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , django_environ, mock, django -, pytest, pytestrunner, pytest-django +, pytest, pytest-runner, pytest-django }: buildPythonPackage rec { pname = "django-guardian"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0"; }; - checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; + checkInputs = [ pytest pytest-runner pytest-django django_environ mock ]; propagatedBuildInputs = [ django ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index c6751eede2fe..f5a9274a0d18 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytestrunner, requests, urllib3, mock, setuptools, stone }: +, pytest-runner, requests, urllib3, mock, setuptools, stone }: buildPythonPackage rec { pname = "dropbox"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # Set DROPBOX_TOKEN environment variable to a valid token. doCheck = false; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index eaf1a78520a2..45d9976896ec 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest, scipy, pytestCheckHook }: buildPythonPackage { pname = "fastpair"; @@ -11,7 +11,7 @@ buildPythonPackage { sha256 = "1l8zgr8awg27lhlkpa2dsvghrb7b12jl1bkgpzg5q7pg8nizl9mx"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; checkInputs = [ pytest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index c0694a58cb71..155f3b6e8290 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -5,7 +5,7 @@ , numba , numpy , pandas -, pytestrunner +, pytest-runner , cramjam , fsspec , thrift @@ -23,7 +23,7 @@ buildPythonPackage rec { hash = "sha256-wSJ6PqW7c8DJCsGuPhXaVGM2s/1dZhLjG4C0JWPcjhY="; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 5af3be420b02..1a3917fbdb7a 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock, - pytestrunner }: + pytest-runner }: buildPythonPackage rec { pname = "favicon"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "6d6b5a78de2a0d0084589f687f384b2ecd6a6527093fec564403b1a30605d7a8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytest requests-mock ]; propagatedBuildInputs = [ requests beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index f845ca6a5d36..1f8c6983cbd8 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , ffmpeg , future -, pytestrunner +, pytest-runner , pytest-mock }: @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ future ]; checkInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index b6f287669c58..0110db18c4c3 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, mock, pytest, pytestrunner +, mock, pytest, pytest-runner , configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing ? null, importlib-metadata }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"; }; - checkInputs = [ pytest mock pytestrunner ]; + checkInputs = [ pytest mock pytest-runner ]; propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] ++ lib.optionals (pythonOlder "3.2") [ configparser functools32 ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ] diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index 73b7eea6e63a..c989cfbb56d5 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -5,7 +5,7 @@ , requests_toolbelt , requests_oauthlib , pytest -, pytestrunner +, pytest-runner , pytest-cov , responses }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; - checkInputs = [ pytest pytestrunner pytest-cov responses ]; + checkInputs = [ pytest pytest-runner pytest-cov responses ]; doCheck = false; # Otherwise: # ========================= no tests ran in 0.01 seconds ========================= # builder for '/nix/store/c8a58v6aa18zci08q2l53s12ywn8jqhq-python3.6-flickrapi-2.4.0.drv' failed with exit code 5 diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix index a6982037c1eb..d9516ceb88b4 100644 --- a/pkgs/development/python-modules/fontmath/default.nix +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , fonttools, setuptools-scm -, pytest, pytestrunner +, pytest, pytest-runner }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ fonttools ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = with lib; { description = "A collection of objects that implement fast font, glyph, etc. math"; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index f755bb8cf8f5..2c54bc4910b5 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner +, cached-property, frozendict, pystache, pyyaml, pytest, pytest-runner }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pytestrunner + pytest-runner cached-property frozendict pystache diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index a65de61b6dbe..691af2eda849 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , setuptools -, pytestrunner +, pytest-runner , pytest , pytest-asyncio , twisted @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682"; }; - nativeBuildInputs = [ setuptools pytestrunner ]; + nativeBuildInputs = [ setuptools pytest-runner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; propagatedBuildInputs = [ uritemplate diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix index 2d2658e00f84..6056d215d227 100644 --- a/pkgs/development/python-modules/grandalf/default.nix +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -4,7 +4,7 @@ , pyparsing , future , pytest -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; patches = [ ./no-setup-requires-pytestrunner.patch ]; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index adb131868c7c..0e8d07465989 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner +, pytest-runner , python-dateutil , babelfish , rebulk @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tests require more packages. doCheck = false; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ python-dateutil babelfish rebulk ]; diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 0852ce4d4430..21af8addaac0 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -10,7 +10,7 @@ , codecov , pytest , pytest-cov -, pytestrunner +, pytest-runner , coveralls , twine , check-manifest @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; # incompatible with latest astropy checkInputs = [ - pytest pytest-cov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov + pytest pytest-cov pytest-runner coveralls scipy pandas astropy twine check-manifest codecov ]; pythonImportsCheck = [ "hickle" ]; diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index ed5179d6db5f..a59f7e08b988 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikitimage }: buildPythonPackage { pname = "image-match"; @@ -11,7 +11,7 @@ buildPythonPackage { sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ scikitimage diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 86bad819a6f7..9f78d86a2be6 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -3,7 +3,7 @@ , six , hypothesis , pytest -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ arrow six ]; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 7507789fd533..e386f390bc23 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, pytest, pytestrunner, pbr, glibcLocales , pytest-cov +, pytest, pytest-runner, pbr, glibcLocales , pytest-cov , requests, requests_oauthlib, requests_toolbelt, defusedxml , ipython }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; }; - buildInputs = [ glibcLocales pytest pytest-cov pytestrunner pbr ]; + buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index 4134c47084a2..3d1575d8c37f 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytest-runner, pytest }: buildPythonPackage rec { pname = "keyutils"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ keyutils ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = { description = "A set of python bindings for keyutils"; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 36918a484c3e..8985e8fbcf51 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - six, pytest, pytestrunner, pytest-cov, coverage + six, pytest, pytest-runner, pytest-cov, coverage }: buildPythonPackage rec { pname = "libais"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # data files missing doCheck = false; - checkInputs = [ pytest pytestrunner pytest-cov coverage ]; + checkInputs = [ pytest pytest-runner pytest-cov coverage ]; propagatedBuildInputs = [ six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/libcloud/2.nix b/pkgs/development/python-modules/libcloud/2.nix index 52c1cf9a9d7f..c59e026fe4f3 100644 --- a/pkgs/development/python-modules/libcloud/2.nix +++ b/pkgs/development/python-modules/libcloud/2.nix @@ -5,7 +5,7 @@ , mock , pycrypto , requests -, pytestrunner +, pytest-runner , pytest , requests-mock , typing @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6"; }; - checkInputs = [ mock pytest pytestrunner requests-mock ]; + checkInputs = [ mock pytest pytest-runner requests-mock ]; propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ]; diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 0449f6099581..78afad13dd20 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -5,7 +5,7 @@ , mock , pycrypto , requests -, pytestrunner +, pytest-runner , pytest , requests-mock , typing @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"; }; - checkInputs = [ mock pytest pytestrunner requests-mock ]; + checkInputs = [ mock pytest pytest-runner requests-mock ]; propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing ]; preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix index 669f16e5f928..3efe41e00797 100644 --- a/pkgs/development/python-modules/lomond/default.nix +++ b/pkgs/development/python-modules/lomond/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook -, pytest-mock, pytestrunner, six, tornado_4 }: +, pytest-mock, pytest-runner, six, tornado_4 }: buildPythonPackage rec { pname = "lomond"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ]; # Makes HTTP requests diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix index a5ea55c39cf5..19bb14419a4f 100644 --- a/pkgs/development/python-modules/lyricwikia/default.nix +++ b/pkgs/development/python-modules/lyricwikia/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: +{ lib, fetchPypi, buildPythonPackage, pytest-runner, six, beautifulsoup4, requests, }: buildPythonPackage rec { pname = "lyricwikia"; version = "0.1.11"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "0l5lkvr3299x79i7skdiggp67rzgax3s00psd1zqkxfysq27jvc8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ six beautifulsoup4 requests ]; # upstream has no code tests doCheck = false; diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 69f272c409d8..ade031409b41 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , cython -, pytestrunner +, pytest-runner , pytestCheckHook , hypothesis }: @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython - pytestrunner + pytest-runner ]; preBuild = '' diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index a7876a75e495..04e59287a86a 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, markdown, - pytest, pytestrunner, pytest-cov, coverage }: + pytest, pytest-runner, pytest-cov, coverage }: buildPythonPackage rec { pname = "MarkdownSuperscript"; @@ -20,7 +20,7 @@ buildPythonPackage rec { sed 's/=.*//' -i requirements/*.txt ''; - checkInputs = [ pytest pytestrunner pytest-cov coverage ]; + checkInputs = [ pytest pytest-runner pytest-cov coverage ]; meta = with lib; { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 794b2c8f4add..8ee3d60f8010 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -5,7 +5,7 @@ , hopcroftkarp , multiset , pytest -, pytestrunner +, pytest-runner , hypothesis , setuptools-scm , isPy27 @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "pytest>=3.0,<4.0" "pytest" ''; - buildInputs = [ setuptools-scm pytestrunner ]; + buildInputs = [ setuptools-scm pytest-runner ]; checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ hopcroftkarp multiset ]; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index b8439a0c23d4..354eace5047d 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , requests -, pytest, pytestrunner, responses +, pytest, pytest-runner, responses }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw"; }; - checkInputs = [ pytest pytestrunner responses ]; + checkInputs = [ pytest pytest-runner responses ]; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 03343aec16e8..f20cb18b4885 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner }: buildPythonPackage rec { pname = "mccabe"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx"; }; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; meta = with lib; { description = "McCabe checker, plugin for flake8"; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index c3ce875b4f57..30969501213c 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k -, sympy, pytest, pytestrunner, sphinx, setuptools-scm }: +, sympy, pytest, pytest-runner, sphinx, setuptools-scm }: buildPythonPackage rec { pname = "measurement"; @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i 's|use_scm_version=True|version="${version}"|' setup.py ''; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; nativeBuildInputs = [ sphinx setuptools-scm ]; propagatedBuildInputs = [ sympy ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 10cbc58eb8d8..ec19843ab9dc 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestCheckHook, pytestrunner, pytest-cov +, pytestCheckHook, pytest-runner, pytest-cov , isPy3k }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"; }; - checkInputs = [ pytestCheckHook pytestrunner pytest-cov ]; + checkInputs = [ pytestCheckHook pytest-runner pytest-cov ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index e183031b8d95..fa2fa87d0e89 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools-scm -, pytestrunner +, pytest-runner , pytest }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7"; }; - buildInputs = [ setuptools-scm pytestrunner ]; + buildInputs = [ setuptools-scm pytest-runner ]; checkInputs = [ pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index 8c29971afe79..c1e57be4ded0 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestrunner + pytest-runner ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix index b69e8401eb51..cd70025d6106 100644 --- a/pkgs/development/python-modules/ndjson/default.nix +++ b/pkgs/development/python-modules/ndjson/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, watchdog, flake8 -, pytest, pytestrunner, coverage, sphinx, twine }: +, pytest, pytest-runner, coverage, sphinx, twine }: buildPythonPackage rec { pname = "ndjson"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY="; }; - checkInputs = [ pytest pytestrunner flake8 twine sphinx coverage watchdog ]; + checkInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ]; meta = with lib; { homepage = "https://github.com/rhgrant10/ndjson"; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 53577567bf6e..f9c27b4c79a3 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytestrunner, python-utils, enum34 }: +{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytest-runner, python-utils, enum34 }: buildPythonPackage rec { pname = "numpy-stl"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; checkPhase = "py.test"; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index ad9da46243b0..42249e933789 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }: +, pytest, pytest-runner, pyyaml, six, pathlib2, isPy27 }: buildPythonPackage rec { pname = "omegaconf"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2; meta = with lib; { diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 1bbb713f40bd..c63c6df86f9f 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -6,7 +6,7 @@ # For tests/setup.py , pytest -, pytestrunner +, pytest-runner , requests-mock }: @@ -17,11 +17,11 @@ buildPythonPackage rec { inherit pname version; sha256 = "4af12f2fbcc9713878ab4ed571e9fda028bc68add34cde0e7226af4d833a4d38"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; checkInputs = [ pytest - pytestrunner + pytest-runner requests-mock ]; diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 92f8f5d90f10..e8344e88f110 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy3k -, stdenv, pytestrunner, pytest, mock }: +, stdenv, pytest-runner, pytest, mock }: buildPythonPackage rec { pname = "paho-mqtt"; @@ -18,7 +18,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "--pylama" "" ''; - checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ pytest-runner pytest ] ++ lib.optional (!isPy3k) mock; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index decb15ff5e6c..709b257e3375 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi , buildPythonPackage, pythonOlder -, pytest, pytestrunner +, pytest, pytest-runner , parse, six, enum34 }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34; checkPhase = '' diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 77196a7c0e99..ba3662a44b03 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestrunner +, pytest-runner , future }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455"; }; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ future ]; meta = with lib; { diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 533a4dc3a308..71b670b707cc 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , six -, pytestrunner +, pytest-runner , pytest }: @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; # Certain tests require network checkPhase = '' diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 672708b0fd9d..b5d429de081a 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner +, pytest-runner , pytest }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "6dead6ab9823a85d585ef27f878bc647f787edb9ca8da0716aa9f1261b464817"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 783c936cf2d1..0f18a6ad2072 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -8,7 +8,7 @@ , semver , pytestCheckHook , pytest-cov -, pytestrunner +, pytest-runner , openapi-spec-validator }: @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix index 242300949ecb..13ecab806c45 100644 --- a/pkgs/development/python-modules/praw/6.3.nix +++ b/pkgs/development/python-modules/praw/6.3.nix @@ -4,7 +4,7 @@ , betamax-matchers , mock , six -, pytestrunner +, pytest-runner , prawcore , pytest , requests-toolbelt @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index c333c3ea4fd1..869aea01a29a 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests -, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytestrunner +, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytest-runner , setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook pytest-cov pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-runner ]; propagatedBuildInputs = [ flask prometheus_client py-air-control ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; }; diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix index b229361917f6..87cfd6b8e427 100644 --- a/pkgs/development/python-modules/py-multibase/default.nix +++ b/pkgs/development/python-modules/py-multibase/default.nix @@ -4,7 +4,7 @@ , lib , morphys , pytest -, pytestrunner +, pytest-runner , python-baseconv , six }: @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix index 48686225e1ef..ec902e0b385d 100644 --- a/pkgs/development/python-modules/pycategories/default.nix +++ b/pkgs/development/python-modules/pycategories/default.nix @@ -5,7 +5,7 @@ , lib , pytest , pythonOlder -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "bd70ecb5e94e7659e564ea153f0c7673291dc37c526c246800fc08d6c5378099"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; # Is private because the author states it's unmaintained # and shouldn't be used in production code diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index a0924fa7f633..539fb9b929d7 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , pytestCheckHook , numpy , pillow @@ -36,7 +36,7 @@ buildPythonPackage { propagatedBuildInputs = [ numpy pillow ]; - checkInputs = [ pytestrunner pytestCheckHook ]; + checkInputs = [ pytest-runner pytestCheckHook ]; # Setting $HOME to prevent pytest to try to create a folder inside # /homeless-shelter which is read-only. diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 833b83b39136..f4afd49bbc28 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -2,7 +2,7 @@ , fetchPypi , lib , vcversioner -, pytestrunner +, pytest-runner , mock , pytest , pytest-asyncio @@ -35,7 +35,7 @@ buildPythonPackage rec { pytest pytest-asyncio pytest-trio - pytestrunner + pytest-runner twisted ] ++ lib.optional isPy27 [ attrs diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index ec4cff2de615..eb6734649b5d 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -6,7 +6,7 @@ , flask , pyquery , pytest -, pytestrunner +, pytest-runner , cairosvg , tinycss , cssselect @@ -38,7 +38,7 @@ buildPythonPackage rec { # Should be a check input, but upstream lists it under "setup_requires". # https://github.com/Kozea/pygal/issues/430 - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index 64573a1a5282..5dbb3d6750f8 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort, mccabe, configparser, backports_functools_lru_cache, singledispatch, - pytest, pytestrunner, setuptools }: + pytest, pytest-runner, setuptools }: buildPythonPackage rec { pname = "pylint"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "004kfapkqxqy2s85pmddqv0fabxdxywxrlbi549p0v237pr2v94p"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ]; diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix index 72f362f85c45..87d46a35fa84 100644 --- a/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -2,7 +2,7 @@ , fetchurl , buildPythonPackage , pymatgen -, pytestrunner +, pytest-runner , pytestCheckHook , isPy3k }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0shldl8is3195jmji7dr3zsh1bzxlahaqrmpr28niks7nnfj80fx"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ pymatgen ]; diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 244b366081c0..67079a8c1d26 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -6,7 +6,7 @@ , greenlet , pythonOlder , isPyPy -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; # Tests require pkgs.neovim, diff --git a/pkgs/development/python-modules/pyosf/default.nix b/pkgs/development/python-modules/pyosf/default.nix index c25b1b114355..07c657bf226e 100644 --- a/pkgs/development/python-modules/pyosf/default.nix +++ b/pkgs/development/python-modules/pyosf/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , requests }: @@ -19,7 +19,7 @@ buildPythonPackage rec { }; preBuild = "export HOME=$TMP"; - buildInputs = [ pytestrunner ]; # required via `setup_requires` + buildInputs = [ pytest-runner ]; # required via `setup_requires` propagatedBuildInputs = [ requests ]; doCheck = false; # requires network access diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix index b8570427d303..4f295dfc7c27 100644 --- a/pkgs/development/python-modules/pysrim/default.nix +++ b/pkgs/development/python-modules/pysrim/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestrunner +, pytest-runner , numpy , pyyaml }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "ada088f73f7e1a3bf085206e81e0f83ed89c1d0b23a789ecd0ba0a250724aee8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ numpy pyyaml ]; # Tests require git lfs download of repository diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 16a1fb92dd6f..e03e0fbe626c 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -5,7 +5,7 @@ , pytest , pylint , six -, pytestrunner +, pytest-runner , toml }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytestrunner/2.nix b/pkgs/development/python-modules/pytest-runner/2.nix similarity index 100% rename from pkgs/development/python-modules/pytestrunner/2.nix rename to pkgs/development/python-modules/pytest-runner/2.nix diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytest-runner/default.nix similarity index 100% rename from pkgs/development/python-modules/pytestrunner/default.nix rename to pkgs/development/python-modules/pytest-runner/default.nix diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index 901a368d5d85..180264f102d0 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -7,7 +7,7 @@ , psutil , pytest , pytest-cov -, pytestrunner +, pytest-runner , setuptools-scm }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf"; }; - nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ]; + nativeBuildInputs = [ setuptools-scm pkgconfig pytest-runner ]; checkInputs = [ pytest pytest-cov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index c368d97633f4..f6814a8d0fda 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, pytestrunner +, pytest-runner , future , requests , responses @@ -31,7 +31,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ future requests requests_oauthlib ]; checkInputs = [ pytest responses hypothesis ]; diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 10dc9f305724..cb25b09dad72 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -2,7 +2,7 @@ , python , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , ply , networkx , decorator @@ -39,7 +39,7 @@ in buildPythonPackage rec { ]; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 1a01eda244b0..ea40fc573b63 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, pytestrunner, pytestCheckHook, glib, vips, cffi +{ buildPythonPackage, fetchPypi, pytest-runner, pytestCheckHook, glib, vips, cffi , pkg-config, pkgconfig, lib }: buildPythonPackage rec { @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2"; }; - nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ]; + nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; buildInputs = [ glib vips ]; diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index e06afb02165b..b6e0684a2d48 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, lib, fetchPypi, numpy -, pydantic, pint, networkx, pytestrunner, pytest-cov, pytest +, pydantic, pint, networkx, pytest-runner, pytest-cov, pytest } : buildPythonPackage rec { pname = "qcelemental"; version = "0.21.0"; - checkInputs = [ pytestrunner pytest-cov pytest ]; + checkInputs = [ pytest-runner pytest-cov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 793e1ada739e..0dd24112bd0b 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, lib, fetchPypi, pyyaml, qcelemental, pydantic -, py-cpuinfo, psutil, pytestrunner, pytest, pytest-cov +, py-cpuinfo, psutil, pytest-runner, pytest, pytest-cov } : buildPythonPackage rec { @@ -7,7 +7,7 @@ buildPythonPackage rec { version = "0.19.0"; checkInputs = [ - pytestrunner + pytest-runner pytest-cov pytest ]; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index fae0bf08e54b..f422934f02fb 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex}: buildPythonPackage rec { pname = "rebulk"; @@ -11,7 +11,7 @@ buildPythonPackage rec { # Some kind of trickery with imports that doesn't work. doCheck = false; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ six regex ]; meta = with lib; { diff --git a/pkgs/development/python-modules/reflink/default.nix b/pkgs/development/python-modules/reflink/default.nix index e9b8beadd16d..9f5024daf7e8 100644 --- a/pkgs/development/python-modules/reflink/default.nix +++ b/pkgs/development/python-modules/reflink/default.nix @@ -3,7 +3,7 @@ , fetchPypi , lib , pytestCheckHook -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo="; }; - propagatedBuildInputs = [ cffi pytestrunner ]; + propagatedBuildInputs = [ cffi pytest-runner ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 3a3feaa14edc..42f10aedf393 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -17,7 +17,7 @@ , pytest , pytest-cov , pytest-mock -, pytestrunner +, pytest-runner , pytest-virtualenv , requests , six @@ -50,7 +50,7 @@ buildPythonPackage rec { pytest pytest-cov pytest-mock - pytestrunner + pytest-runner pytest-virtualenv requests six diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index bb5cc138a749..58fa81b444f3 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pkg-config , pytest -, pytestrunner +, pytest-runner , cffi , secp256k1 }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pkg-config ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ cffi secp256k1 ]; # Tests are not included in archive diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix index 26b8d732be1d..f959458d2653 100644 --- a/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest , virtualenv -, pytestrunner +, pytest-runner , pytest-virtualenv , twisted , pathlib2 @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; }; - buildInputs = [ pytest virtualenv pytestrunner pytest-virtualenv ]; + buildInputs = [ pytest virtualenv pytest-runner pytest-virtualenv ]; propagatedBuildInputs = [ twisted pathlib2 ]; postPatch = '' diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index e96161228a52..c82eba66acae 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -10,7 +10,7 @@ , pytest-cov , pytest-mock , pytestCheckHook -, pytestrunner +, pytest-runner , requests , responses , six @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest-cov pytest-mock pytestCheckHook - pytestrunner + pytest-runner responses ]; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 67a6dba1a8ed..35f7d7c07c98 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -7,7 +7,7 @@ , sqlite-fts4 , tabulate , pytestCheckHook -, pytestrunner +, pytest-runner , black , hypothesis , sqlite @@ -32,7 +32,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestrunner + pytest-runner black hypothesis ]; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 68ca009d9dc2..5339529f3d75 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, six, pytest, pytest-runner }: buildPythonPackage rec { pname = "srptools"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = with lib; { description = "Python-Tools to implement Secure Remote Password (SRP) authentication"; diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index 904595865b8c..510bbbac9518 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -5,7 +5,7 @@ , cffi , six , pytest -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0px8k4fjbkjb717bg2v7rjhm4iclrxzq7sh0hfqs55f4ddqi0m8v"; }; - buildInputs = [ pkgs.ssdeep pytestrunner ]; + buildInputs = [ pkgs.ssdeep pytest-runner ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ cffi six ]; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 6bbeb23ed1f5..a9fdfe2050e2 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , requests, six -, backports_unittest-mock, pytestCheckHook, pytestrunner }: +, backports_unittest-mock, pytestCheckHook, pytest-runner }: buildPythonPackage rec { pname = "sseclient"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # some tests use python3 strings doCheck = !isPy27; - checkInputs = [ backports_unittest-mock pytestCheckHook pytestrunner ]; + checkInputs = [ backports_unittest-mock pytestCheckHook pytest-runner ]; # tries to open connection to wikipedia disabledTests = [ "event_stream" ]; diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 21c92fcee7e9..8ea42d1f2795 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -2,7 +2,7 @@ , coverage , mock , ply -, pytestrunner +, pytest-runner , pytestCheckHook , six }: @@ -24,7 +24,7 @@ buildPythonPackage rec { --replace "coverage==5.3" "coverage" ''; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ ply six ]; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index fe92b71f3f52..e334608bd4dc 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -20,7 +20,7 @@ , pytest , pytest-flakes , pytest-cov -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ sympy vcrpy pytest pytest-flakes - pytest-cov pytestrunner + pytest-cov pytest-runner ]; # https://github.com/Diaoul/subliminal/pull/963 diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index d5dfda53c08c..83f6d9ac0637 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , colorama, regex -, pytestrunner, pytestCheckHook, pytest-mypy +, pytest-runner, pytestCheckHook, pytest-mypy }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ colorama regex ]; checkInputs = [ pytestCheckHook pytest-mypy ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 7a025577dbb0..05ca81772d81 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -6,7 +6,7 @@ , webencodings # Check inputs , pytest -, pytestrunner +, pytest-runner , pytest-cov , pytest-flake8 , pytest-isort @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webencodings ]; - checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ]; # https://github.com/PyCQA/pycodestyle/issues/598 preCheck = '' diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index f1e90114ac6d..508e38da4500 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix index dbfad336d0f3..2c289f852699 100644 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ b/pkgs/development/python-modules/torchgpipe/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , pytestCheckHook , pytorch }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytorch ]; - checkInputs = [ pytestrunner pytestCheckHook ]; + checkInputs = [ pytest-runner pytestCheckHook ]; disabledTests = [ "test_inplace_on_requires_grad" "test_input_requiring_grad" diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index a9345b374a7e..2055a4813447 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , isPy27 , fetchPypi -, pytestrunner +, pytest-runner , setuptools-scm , singledispatch ? null , pytest @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner setuptools-scm ]; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index c578b7c7c8c0..ecc13b1d6377 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -13,7 +13,7 @@ fontconfig, lib, stdenv, pytest, - pytestrunner, + pytest-runner, pytest-isort, pytest-flake8, pytest-cov, @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501' ''; - checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytest-cov ]; + checkInputs = [ pytest pytest-runner pytest-isort pytest-flake8 pytest-cov ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 0aeb85e6ca2d..66d219f9348e 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , pythonOlder , multidict -, pytestrunner +, pytest-runner , pytest , typing-extensions , idna @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ multidict idna ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 61aee215031a..f880d8fa7b7f 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { patchShebangs cpplint_unittest.py ''; - checkInputs = with python3Packages; [ pytest pytestrunner ]; + checkInputs = with python3Packages; [ pytest pytest-runner ]; checkPhase = '' ./cpplint_unittest.py ''; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 9ffcbb172d48..1341017df056 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake -, pytestrunner, pytest, six, pyparsing, asn1ate }: +, pytest-runner, pytest, six, pyparsing, asn1ate }: buildPythonApplication rec { pname = "asn2quickder"; @@ -19,7 +19,7 @@ buildPythonApplication rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ makeWrapper cmake ]; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; propagatedBuildInputs = [ pyparsing asn1ate six ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 787513855772..58a634ee86c9 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -499,7 +499,7 @@ self: super: old: { inherit (pkgs.python3Packages.jira) patches; buildInputs = (old.buildInputs or [ ]) ++ [ - self.pytestrunner + self.pytest-runner self.cryptography self.pyjwt ]; @@ -1269,8 +1269,6 @@ self: super: } ); - pytest-runner = super.pytest-runner or super.pytestrunner; - pytest-pylint = super.pytest-pylint.overridePythonAttrs ( old: { buildInputs = [ self.pytest-runner ]; diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 1bac8b0fe0ce..6a8786be6eaa 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index 8774715bb1d8..8128ec6f04d4 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp"; }; - nativeBuildInputs = [ pytestrunner flake8]; + nativeBuildInputs = [ pytest-runner flake8]; propagatedBuildInputs = [ aioh2 diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index b0902feeead4..d4ab51ce84f8 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { ]; checkInputs = with python3.pkgs; [ - pytestrunner + pytest-runner pytest ]; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index ab6b7d812211..28929615bcdb 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -100,7 +100,7 @@ pythonPackages.buildPythonApplication rec { mock pexpect pytest - pytestrunner + pytest-runner ]); postInstall = '' diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index aae6ce329f68..fa2f69bb3ef5 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytest-cov, pytestrunner, lib, stringcase +, pytest-cov, pytest-runner, lib, stringcase }: buildPythonApplication rec { @@ -19,7 +19,7 @@ buildPythonApplication rec { ]; buildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index cd04e2020b1c..08da843ad33e 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access - checkInputs = with python3Packages; [ ffmpeg pytest pytestrunner ]; + checkInputs = with python3Packages; [ ffmpeg pytest pytest-runner ]; meta = with lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index a40e2ce33c99..d84f6f299005 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { checkInputs = lib.optionals pythonSupport [ pythonPackages.pytest - pythonPackages.pytestrunner + pythonPackages.pytest-runner ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64a5bb748ec..3fe3b02860de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25540,7 +25540,7 @@ in matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { inherit (python3Packages) buildPythonApplication buildPythonPackage - pygobject3 pytestrunner requests responses pytest python-olm + pygobject3 pytest-runner requests responses pytest python-olm canonicaljson; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f42713fee3db..7e74bce1f7bf 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 + pytestrunner = pytest-runner; # added 2021-01-04 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f689a562a49d..3a811bc9b7d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6883,8 +6883,7 @@ in { pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; - pytest-runner = self.pytestrunner; # added 2021-01-04 - pytestrunner = callPackage ../development/python-modules/pytestrunner { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner { }; pytest-sanic = callPackage ../development/python-modules/pytest-sanic { sanic = self.sanic.override { doCheck = false; }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 471548b9fa20..decf36f31e8b 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -478,7 +478,7 @@ with self; with super; { pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { }; - pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { }; pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; From dd712027be98a6d782fc9cb492f557bb48e3dd31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:08:40 +0200 Subject: [PATCH 03/11] pythonPackages: deprecate pytestquickcheck alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7e74bce1f7bf..8c11398d6b9a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 + pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a811bc9b7d2..640f1fdc2521 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6862,8 +6862,7 @@ in { pytest-qt = callPackage ../development/python-modules/pytest-qt { }; - pytest-quickcheck = self.pytestquickcheck; - pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; + pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; pytest-raises = callPackage ../development/python-modules/pytest-raises { }; From 2e9c330216f5fbb3a5e645ba398a839c5ea08e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:08:56 +0200 Subject: [PATCH 04/11] pythonPackages: deprecate pytest_xdist alias --- pkgs/applications/audio/quodlibet/default.nix | 2 +- pkgs/applications/office/paperless/default.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 2 +- pkgs/development/python-modules/aria2p/default.nix | 4 ++-- pkgs/development/python-modules/certbot/default.nix | 4 ++-- pkgs/development/python-modules/debugpy/default.nix | 4 ++-- pkgs/development/python-modules/diskcache/default.nix | 4 ++-- pkgs/development/python-modules/dyn/default.nix | 4 ++-- pkgs/development/python-modules/hypothesis/2.nix | 4 ++-- pkgs/development/python-modules/ignite/default.nix | 4 ++-- pkgs/development/python-modules/keras/default.nix | 4 ++-- pkgs/development/python-modules/lazy_import/default.nix | 4 ++-- pkgs/development/python-modules/nipype/default.nix | 4 ++-- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- pkgs/development/python-modules/pytest-django/default.nix | 4 ++-- pkgs/development/python-modules/pytest-randomly/default.nix | 4 ++-- pkgs/development/python-modules/sqlalchemy/default.nix | 2 +- pkgs/development/python-modules/stripe/default.nix | 4 ++-- pkgs/development/python-modules/typer/default.nix | 4 ++-- pkgs/tools/admin/lexicon/default.nix | 2 +- pkgs/tools/text/ocrmypdf/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 1 - pkgs/top-level/python2-packages.nix | 1 - 24 files changed, 37 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 24f9f057b65a..6c8ad8225f0b 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext ]; - checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]); + checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest-xdist polib xvfb-run dbus.daemon glibcLocales ]); buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xine-lib ] else with gst_all_1; diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index 68032ebe8497..74bdacd95845 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -148,7 +148,7 @@ let pytest pytest-django pytest-env - pytest_xdist + pytest-xdist ]; pyocrWithUserTesseract = pyPkgs: diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 7df426177483..74c2503523e8 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens -, pycryptodome, pytest_xdist, pytest-cov, recommonmark, semantic-version, sphinx +, pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx , sphinx_rtd_theme, pytest-runner }: let diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 4755c80e707c..2a7e6cb0df95 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, aria2, poetry, pytest, pytest-cov, pytest_xdist, responses +, aria2, poetry, pytest, pytest-cov, pytest-xdist, responses , asciimatics, loguru, requests, setuptools, websocket-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ aria2 responses pytest pytest-cov pytest_xdist ]; + checkInputs = [ aria2 responses pytest pytest-cov pytest-xdist ]; # Tests are not all stable/deterministic, # they rely on actually running an aria2c daemon and communicating with it, diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 7c324e646a4d..255c3ebfdeb9 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline -, pytest_xdist, pytestCheckHook, python-dateutil +, pytest-xdist, pytestCheckHook, python-dateutil }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { checkInputs = [ python-dateutil pytestCheckHook - pytest_xdist + pytest-xdist ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index da1f25ad2c3e..283682708840 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -8,7 +8,7 @@ , flask , psutil , pytest-timeout -, pytest_xdist +, pytest-xdist , pytestCheckHook , requests , isPy27 @@ -75,7 +75,7 @@ buildPythonPackage rec { flask psutil pytest-timeout - pytest_xdist + pytest-xdist pytestCheckHook requests ] ++ lib.optionals (!isPy27) [ diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 50b1a94c7795..0264c0ff10c5 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , pytestCheckHook , pytest-cov -, pytest_xdist +, pytest-xdist , pytest-django , mock }: @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-cov - pytest_xdist + pytest-xdist pytest-django mock ]; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 72986e7bda1e..8db7f6c9169d 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock -, pytest_xdist, covCore, glibcLocales }: +, pytest-xdist, covCore, glibcLocales }: buildPythonPackage rec { pname = "dyn"; @@ -16,7 +16,7 @@ buildPythonPackage rec { pytest pytest-cov mock - pytest_xdist + pytest-xdist covCore ]; # Disable checks because they are not stateless and require internet access. diff --git a/pkgs/development/python-modules/hypothesis/2.nix b/pkgs/development/python-modules/hypothesis/2.nix index 5b086d5f1a7f..47bc8860bc54 100644 --- a/pkgs/development/python-modules/hypothesis/2.nix +++ b/pkgs/development/python-modules/hypothesis/2.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub , isPy3k, attrs, coverage, enum34, pexpect -, doCheck ? true, pytest, pytest_xdist, flaky, mock +, doCheck ? true, pytest, pytest-xdist, flaky, mock , sortedcontainers }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { sortedcontainers ] ++ lib.optional (!isPy3k) enum34; - checkInputs = [ pytest pytest_xdist flaky mock pexpect ]; + checkInputs = [ pytest pytest-xdist flaky mock pexpect ]; inherit doCheck; checkPhase = '' diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index b82fe568e2a9..432767b9f984 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, pytest_xdist +, pytest-xdist , pythonOlder , matplotlib , mock @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "057v8v5p2picmgiidr9lzjbh7nj54pv95m6lyya3y7dw4vzaamij"; }; - checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ]; + checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist ]; propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ]; # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index b6ac0a1fa132..28b09222b472 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytest-cov, pytest_xdist +, pytest, pytest-cov, pytest-xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing }: @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-cov - pytest_xdist + pytest-xdist ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index 60eba0577b03..fe35126ea26c 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytest -, pytest_xdist +, pytest-xdist , six }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytest_xdist + pytest-xdist ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 7ecba3b7d3b1..8d0c597a1af0 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -19,7 +19,7 @@ , pybids , pydot , pytest -, pytest_xdist +, pytest-xdist , pytest-forked , rdflib , scipy @@ -93,7 +93,7 @@ buildPythonPackage rec { mock pytest pytest-forked - pytest_xdist + pytest-xdist pytest-cov which ]; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 3a720bf328f3..ff312cbff891 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -2,7 +2,7 @@ , fonttools , lxml, fs # for fonttools extras , setuptools-scm -, pytestCheckHook, pytest-cov, pytest_xdist +, pytestCheckHook, pytest-cov, pytest-xdist }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-cov - pytest_xdist + pytest-xdist ]; disabledTests = [ # Test that fails on pytest >= v6 diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 0253ed5a5138..47cc882f548e 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -5,7 +5,7 @@ , django , setuptools-scm , django-configurations -, pytest_xdist +, pytest-xdist , six }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest setuptools-scm ]; - checkInputs = [ pytest django-configurations pytest_xdist six ]; + checkInputs = [ pytest django-configurations pytest-xdist six ]; propagatedBuildInputs = [ django ]; # Complicated. Requires Django setup. diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index f8e240ca57e4..0020a4bf433f 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , factory_boy, faker, numpy, backports-entry-points-selectable -, pytestCheckHook, pytest_xdist +, pytestCheckHook, pytest-xdist }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest_xdist + pytest-xdist numpy factory_boy faker diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 6c576f0b85e9..a3e00dff4ef6 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -9,7 +9,7 @@ , mock , pysqlite ? null , pytestCheckHook -, pytest_xdist +, pytest-xdist }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index a0b5c9799254..7aa955e99e25 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest_xdist }: +{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest-xdist }: buildPythonPackage rec { pname = "stripe"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytest-cov pytest-mock pytest_xdist ]; + checkInputs = [ pytest pytest-cov pytest-mock pytest-xdist ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 13d037515c3f..5b7b17c8bb84 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , shellingham , pytest-cov -, pytest_xdist +, pytest-xdist , pytest-sugar , coverage , mypy @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-cov - pytest_xdist + pytest-xdist pytest-sugar shellingham coverage diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 7737205ce02d..c183e3741429 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -66,7 +66,7 @@ buildPythonApplication rec { mock pytest pytest-cov - pytest_xdist + pytest-xdist vcrpy ]; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 0e13e4c5f35c..1a60d7d013ef 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -64,7 +64,7 @@ buildPythonApplication rec { pypdf2 pytest pytest-helpers-namespace - pytest_xdist + pytest-xdist pytest-cov python-xmp-toolkit pytestCheckHook diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8c11398d6b9a..d84505d22a62 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -57,6 +57,7 @@ mapAliases ({ pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 + pytest_xdist = pytest-xdist; # added 2021-01-04 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 640f1fdc2521..8ecef5f04efa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6926,7 +6926,6 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index decf36f31e8b..48ddb18291af 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -480,7 +480,6 @@ with self; with super; { pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { }; - pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; python-otr = callPackage ../development/python-modules/python-otr { }; From a5158b8c01cc92b6057beec08ed402cc5614ccdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:19:21 +0200 Subject: [PATCH 05/11] pythonPackages: deprecate python_simple_hipchat alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d84505d22a62..bb986d7fd125 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -58,6 +58,7 @@ mapAliases ({ pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 pytest_xdist = pytest-xdist; # added 2021-01-04 + python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ecef5f04efa..efd77004c3dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7124,7 +7124,6 @@ in { python-sat = callPackage ../development/python-modules/python-sat { }; python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { }; - python_simple_hipchat = self.python-simple-hipchat; python-slugify = callPackage ../development/python-modules/python-slugify { }; From 703c10847211d13fd897a54061d90123680b410a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:21:18 +0200 Subject: [PATCH 06/11] pythonPackages: deprecate requests_toolbelt alias --- pkgs/applications/misc/khal/default.nix | 2 +- pkgs/applications/networking/sync/acd_cli/default.nix | 4 ++-- pkgs/development/python-modules/argcomplete/default.nix | 4 ++-- pkgs/development/python-modules/betamax-matchers/default.nix | 4 ++-- pkgs/development/python-modules/cherrypy/17.nix | 4 ++-- pkgs/development/python-modules/cherrypy/default.nix | 4 ++-- pkgs/development/python-modules/flickrapi/default.nix | 4 ++-- pkgs/development/python-modules/gradient/default.nix | 4 ++-- pkgs/development/python-modules/jira/default.nix | 4 ++-- pkgs/development/python-modules/prawcore/default.nix | 4 ++-- pkgs/development/python-modules/twine/default.nix | 4 ++-- pkgs/development/python-modules/vdirsyncer/default.nix | 4 ++-- pkgs/development/python-modules/webexteamssdk/default.nix | 4 ++-- pkgs/development/python-modules/zeep/default.nix | 4 ++-- pkgs/development/tools/cloudsmith-cli/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 18 files changed, 30 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index c7c184febe17..8ad7578adebb 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -20,7 +20,7 @@ with python3.pkgs; buildPythonApplication rec { pkgs.vdirsyncer pytz pyxdg - requests_toolbelt + requests-toolbelt tzlocal urwid pkginfo diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index f630cb4071a4..95970a7b8709 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication, fuse -, appdirs, colorama, python-dateutil, requests, requests_toolbelt +, appdirs, colorama, python-dateutil, requests, requests-toolbelt , fusepy, sqlalchemy, setuptools }: buildPythonApplication rec { @@ -16,7 +16,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests - requests_toolbelt setuptools sqlalchemy ]; + requests-toolbelt setuptools sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 6c62fd104f21..cf2f92557206 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,7 +3,7 @@ , importlib-metadata , pexpect , prettytable -, requests_toolbelt +, requests-toolbelt }: buildPythonPackage rec { pname = "argcomplete"; @@ -24,7 +24,7 @@ buildPythonPackage rec { importlib-metadata pexpect prettytable - requests_toolbelt + requests-toolbelt ]; pythonImportsCheck = [ "argcomplete" ]; diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index 459d3c51d7ed..087329d103e7 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, betamax, requests_toolbelt }: +, betamax, requests-toolbelt }: buildPythonPackage rec { pname = "betamax-matchers"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43"; }; - buildInputs = [ betamax requests_toolbelt ]; + buildInputs = [ betamax requests-toolbelt ]; meta = with lib; { homepage = "https://github.com/sigmavirus24/betamax_matchers"; diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index 82e878c83042..2ae180a8bae6 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchPypi , setuptools-scm , cheroot, contextlib2, portend, routes, six, zc_lockfile -, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests_toolbelt +, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests-toolbelt }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ - backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests_toolbelt + backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests-toolbelt ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index b4fa2b8aeb45..0c6f83ea71db 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,7 +2,7 @@ , setuptools-scm , cheroot, portend, more-itertools, zc_lockfile, routes , jaraco_collections -, objgraph, pytest, pytest-cov, pathpy, requests_toolbelt, pytest-services +, objgraph, pytest, pytest-cov, pathpy, requests-toolbelt, pytest-services , fetchpatch }: @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; checkInputs = [ - objgraph pytest pytest-cov pathpy requests_toolbelt pytest-services + objgraph pytest pytest-cov pathpy requests-toolbelt pytest-services ]; # Keyboard interrupt ends test suite run diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index c989cfbb56d5..d7d20f19ea7b 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , requests -, requests_toolbelt +, requests-toolbelt , requests_oauthlib , pytest , pytest-runner @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "03g2z21k6nhxgwysjrgnxj9m1yg25mnnkr10gpyfhfkd9w77pcpz"; }; - propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; + propagatedBuildInputs = [ requests requests-toolbelt requests_oauthlib ]; checkInputs = [ pytest pytest-runner pytest-cov responses ]; doCheck = false; # Otherwise: diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 92ddbbd73f7b..57b58699ec38 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -15,7 +15,7 @@ , pyopenssl , pyyaml , requests -, requests_toolbelt +, requests-toolbelt , terminaltables , websocket-client }: @@ -53,7 +53,7 @@ buildPythonPackage rec { pyopenssl pyyaml requests - requests_toolbelt + requests-toolbelt terminaltables websocket-client ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index e386f390bc23..a3f790abfc51 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , pytest, pytest-runner, pbr, glibcLocales , pytest-cov -, requests, requests_oauthlib, requests_toolbelt, defusedxml +, requests, requests_oauthlib, requests-toolbelt, defusedxml , ipython }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; - propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; + propagatedBuildInputs = [ requests requests_oauthlib requests-toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers doCheck = false; diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 686487c0256d..cb72e69af77d 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -4,7 +4,7 @@ , requests , testfixtures , mock -, requests_toolbelt +, requests-toolbelt , betamax , betamax-serializers , betamax-matchers @@ -32,7 +32,7 @@ buildPythonPackage rec { betamax betamax-serializers betamax-matchers - requests_toolbelt + requests-toolbelt pytestCheckHook ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index b78f38c46cf8..da5c4a9c3f51 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -5,7 +5,7 @@ , pyblake2 , readme_renderer , requests -, requests_toolbelt +, requests-toolbelt , setuptools-scm , tqdm , colorama @@ -30,7 +30,7 @@ buildPythonPackage rec { pyblake2 readme_renderer requests - requests_toolbelt + requests-toolbelt tqdm colorama rfc3986 diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 1dd80b52d19b..cdd8ff02b97e 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -6,7 +6,7 @@ , click , click-log , click-threading -, requests_toolbelt +, requests-toolbelt , requests , requests_oauthlib # required for google oauth sync , atomicwrites @@ -34,7 +34,7 @@ buildPythonPackage rec { click-threading requests requests_oauthlib # required for google oauth sync - requests_toolbelt + requests-toolbelt ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 21c9e352bf0d..e70cdfd96c86 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -4,7 +4,7 @@ , future , pyjwt , requests -, requests_toolbelt +, requests-toolbelt }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { future pyjwt requests - requests_toolbelt + requests-toolbelt ]; # Tests require a Webex Teams test domain diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 7c72d2500346..16fb27774631 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -19,7 +19,7 @@ , pythonOlder , pytz , requests -, requests_toolbelt +, requests-toolbelt , requests-file , requests-mock , xmlsec @@ -47,7 +47,7 @@ buildPythonPackage rec { lxml pytz requests - requests_toolbelt + requests-toolbelt requests-file xmlsec ]; diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index 8de2bc1aeed2..8d36c8990828 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { colorama future requests - requests_toolbelt + requests-toolbelt semver simplejson six diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fe3b02860de..28d0674bd8b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22964,7 +22964,7 @@ in acd-cli = callPackage ../applications/networking/sync/acd_cli { inherit (python3Packages) buildPythonApplication appdirs colorama python-dateutil - requests requests_toolbelt setuptools sqlalchemy fusepy; + requests requests-toolbelt setuptools sqlalchemy fusepy; }; adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bb986d7fd125..2573d07e4a20 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -60,6 +60,7 @@ mapAliases ({ pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + requests_toolbelt = requests-toolbelt; # added 2017-09-26 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efd77004c3dd..12fd990bad1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7551,8 +7551,6 @@ in { requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; - requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 - requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; requirements-detector = callPackage ../development/python-modules/requirements-detector { }; From 5c31546ae8a4b0103ed7d5378c8e281df8946585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:22:39 +0200 Subject: [PATCH 07/11] pythonPackages: deprecate scikitlearn alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 2573d07e4a20..f97da2c4b34a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -62,6 +62,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 requests_toolbelt = requests-toolbelt; # added 2017-09-26 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 + scikitlearn = scikit-learn; # added 2021-07-21 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 smart_open = smart-open; # added 2021-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12fd990bad1e..f789bce4a8bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7804,8 +7804,6 @@ in { inherit (pkgs) gfortran glibcLocales; }; - scikitlearn = self.scikit-learn; - scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; scikits-odes = callPackage ../development/python-modules/scikits-odes { }; From 5c425ca23d9e36854f4bacaf3365d85f330553dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:24:25 +0200 Subject: [PATCH 08/11] python-aliases: sort --- pkgs/top-level/python-aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f97da2c4b34a..4a689edc1afc 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -34,6 +34,7 @@ in mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 + bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 @@ -70,5 +71,4 @@ mapAliases ({ topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 websocket_client = websocket-client; - bt_proximity = bt-proximity; # added 2021-07-02 }) From 9df3d2ca2c2dff2961a0be338fb90454e11349fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:24:38 +0200 Subject: [PATCH 09/11] pythonPackages: deprecate zc_buildout221 alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4a689edc1afc..376250bcb2f6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -71,4 +71,5 @@ mapAliases ({ topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 websocket_client = websocket-client; + zc_buildout221 = zc_buildout; # added 2021-07-21 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f789bce4a8bd..e9289880cac1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9447,9 +9447,7 @@ in { zarr = callPackage ../development/python-modules/zarr { }; - zc_buildout221 = callPackage ../development/python-modules/buildout { }; - - zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix + zc_buildout = callPackage ../development/python-modules/buildout { }; zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; From b4099137b1c8e9e9dd78705058fabe785eba9df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:26:16 +0200 Subject: [PATCH 10/11] pythonPackages: deprecate ConfigArgParse alias --- pkgs/applications/misc/coursera-dl/default.nix | 2 +- pkgs/applications/misc/rofimoji/default.nix | 4 ++-- pkgs/applications/science/misc/snakemake/default.nix | 2 +- pkgs/development/misc/resholve/resholve.nix | 2 +- pkgs/development/python-modules/certbot/default.nix | 4 ++-- pkgs/development/python-modules/libagent/default.nix | 4 ++-- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- pkgs/misc/acpilight/default.nix | 2 +- pkgs/tools/admin/gixy/default.nix | 2 +- pkgs/tools/misc/yle-dl/default.nix | 2 +- pkgs/tools/networking/linkchecker/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 1 - 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 56938f5338dc..954501c0b7fe 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -18,7 +18,7 @@ in pythonPackages.buildPythonApplication rec { buildInputs = with pythonPackages; [ glibcLocales ]; - propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ]; + propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 configargparse keyring pyasn1 requests six urllib3 ]; checkInputs = with pythonPackages; [ pytest mock ]; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 79a4d9fc7abe..d0d59af604d4 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -5,7 +5,7 @@ , waylandSupport ? true , x11Support ? true -, ConfigArgParse +, configargparse , rofi , wl-clipboard , wtype @@ -26,7 +26,7 @@ buildPythonApplication rec { # `rofi` and the `waylandSupport` and `x11Support` dependencies # contain binaries needed at runtime. - propagatedBuildInputs = with lib; [ ConfigArgParse rofi ] + propagatedBuildInputs = with lib; [ configargparse rofi ] ++ optionals waylandSupport [ wl-clipboard wtype ] ++ optionals x11Support [ xdotool xsel ]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 5270cac57823..419323cfa31f 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ appdirs - ConfigArgParse + configargparse connection-pool datrie docutils diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 4d039770ce0e..d3603266bea9 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -43,7 +43,7 @@ python27Packages.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ deps.oildev python27Packages.ConfigArgParse ]; + propagatedBuildInputs = [ deps.oildev python27Packages.configargparse ]; patchPhase = '' for file in resholve; do diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 255c3ebfdeb9..61ec6c2125ff 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , python, runCommand , fetchFromGitHub -, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface +, configargparse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline , pytest-xdist, pytestCheckHook, python-dateutil }: @@ -21,7 +21,7 @@ buildPythonPackage rec { sourceRoot = "source/${pname}"; propagatedBuildInputs = [ - ConfigArgParse + configargparse acme configobj cryptography diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 5334513e23c8..24d8ada58902 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, - unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, + unidecode, mock, pytest , backports-shutil-which, configargparse, python-daemon, pymsgbox }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "16y1y9ahcv3wj7f0v4mfiwzkmn2hz1iv7y13cgr57sxa3ymyqx6c"; }; - propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse + propagatedBuildInputs = [ unidecode backports-shutil-which configargparse python-daemon pymsgbox ecdsa ed25519 mnemonic semver ]; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 9837128a7fdc..c975218e5b1d 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address -, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs +, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, configargparse, appdirs }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { pypdf2 dict2xml weasyprint - ConfigArgParse + configargparse appdirs ]; diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix index b5a385ab4076..d6fead938a45 100644 --- a/pkgs/misc/acpilight/default.nix +++ b/pkgs/misc/acpilight/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; pyenv = python3.withPackages (pythonPackages: with pythonPackages; [ - ConfigArgParse + configargparse ]); postConfigure = '' diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 1711792ab2bc..65ca85b463e9 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ cached-property - ConfigArgParse + configargparse pyparsing jinja2 nose diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 08da843ad33e..209072da3b0b 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - attrs ConfigArgParse ffmpeg future lxml requests + attrs configargparse ffmpeg future lxml requests ]; pythonPath = [ rtmpdump php wget ]; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 05da924c47e4..480321ad15fc 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ - ConfigArgParse + configargparse argcomplete beautifulsoup4 pyopenssl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28d0674bd8b0..55550e8fa11a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26825,7 +26825,7 @@ in rofi-systemd = callPackage ../tools/system/rofi-systemd { }; rofimoji = callPackage ../applications/misc/rofimoji { - inherit (python3Packages) buildPythonApplication ConfigArgParse; + inherit (python3Packages) buildPythonApplication configargparse; }; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 376250bcb2f6..4582583f33ba 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,6 +36,7 @@ mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + ConfigArgParse = configargparse; # added 2021-03-18 dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "it's dependency lammps-cython no longer builds"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9289880cac1..c554aa014ea4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1607,7 +1607,6 @@ in { conda = callPackage ../development/python-modules/conda { }; - ConfigArgParse = self.configargparse; # added 2021-03-18 configargparse = callPackage ../development/python-modules/configargparse { }; configobj = callPackage ../development/python-modules/configobj { }; From 4a87fb096d66eb7336d30d326c6839fe71a399cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:27:12 +0200 Subject: [PATCH 11/11] pythonPackages: deprecate djangorestframework-jwt alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4582583f33ba..294c90f66566 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -42,6 +42,7 @@ mapAliases ({ dftfit = throw "it's dependency lammps-cython no longer builds"; diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 + djangorestframework-jwt = drf-jwt; dns = dnspython; # Alias for compatibility, 2017-12-10 faulthandler = throw "faulthandler is built into ${python.executable}"; gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c554aa014ea4..3a2c7aec4f43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2063,8 +2063,6 @@ in { djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - djangorestframework-jwt = self.drf-jwt; - djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; django_reversion = callPackage ../development/python-modules/django_reversion { };