diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-06-03 12:09:11 +0200 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-06-03 12:44:33 +0200 |
| commit | 89d5f4b3d09f86ffe9d9335c37d1f7e2dccaa5dc (patch) | |
| tree | 4169f66ca4727f1ece429bb6c0bf2fa09703ce28 | |
| parent | 6d0f8c801534c9f8f90daa385ddf010692bab310 (diff) | |
| download | nixpkgs-89d5f4b3d09f86ffe9d9335c37d1f7e2dccaa5dc.tar nixpkgs-89d5f4b3d09f86ffe9d9335c37d1f7e2dccaa5dc.tar.gz nixpkgs-89d5f4b3d09f86ffe9d9335c37d1f7e2dccaa5dc.tar.bz2 nixpkgs-89d5f4b3d09f86ffe9d9335c37d1f7e2dccaa5dc.tar.lz nixpkgs-89d5f4b3d09f86ffe9d9335c37d1f7e2dccaa5dc.tar.xz nixpkgs-89d5f4b3d09f86ffe9d9335c37d1f7e2dccaa5dc.tar.zst nixpkgs-89d5f4b3d09f86ffe9d9335c37d1f7e2dccaa5dc.zip | |
treewide: setuptools_scm -> setuptools-scm
169 files changed, 308 insertions, 308 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index b466748f548..feefefeabb7 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -847,7 +847,7 @@ using setup hooks. The following is an example: ```nix -{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools_scm, attrs, py, setuptools, six, pluggy }: +{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools-scm, attrs, py, setuptools, six, pluggy }: buildPythonPackage rec { pname = "pytest"; @@ -864,7 +864,7 @@ buildPythonPackage rec { ''; checkInputs = [ hypothesis ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy ]; meta = with lib; { diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index a295788c117..e96a6bfef20 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -23,7 +23,7 @@ in python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - setuptools_scm + setuptools-scm docutils ]; diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 0c4220b72ba..09fe6d1b2dd 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { python3Packages.setuptools-scm ]; - # give a hint to setuptools_scm on package version + # give a hint to setuptools-scm on package version SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 97d01a1e1b5..5c6b505dd68 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -30,7 +30,7 @@ with python3.pkgs; buildPythonApplication rec { pkginfo freezegun ]; - nativeBuildInputs = [ setuptools_scm sphinx sphinxcontrib_newsfeed ]; + nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed ]; checkInputs = [ pytest glibcLocales ]; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 05886a85bf0..ac4811b30c4 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -17,7 +17,7 @@ sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest mock ]; propagatedBuildInputs = [ six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index 5765aeba7dd..c5f3143bedc 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -12,7 +12,7 @@ in buildPythonApplication rec { inherit pname version; sha256 = "da0365ae9064e30c4a27526fb0d7a802fda5c8651cda6990d17be7ede89a2551"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ]; checkPhase = '' diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index e43cf7b95b9..88b215acdfa 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "3d694015d020a888b42564d56559213b94981ca2b32b952a49b2de4d029d2e59"; }; - nativeBuildInputs = [ python3Packages.setuptools_scm ]; + nativeBuildInputs = [ python3Packages.setuptools-scm ]; pythonPath = with python3Packages; [ i3ipc ]; # no tests diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 8a5f607dd32..2e6c8cf0236 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff"; }; - nativeBuildInputs = with python3Packages; [ sphinx setuptools_scm ]; + nativeBuildInputs = with python3Packages; [ sphinx setuptools-scm ]; propagatedBuildInputs = with python3Packages; [ python3Packages.setuptools python3Packages.notmuch chardet dkimpy diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index 6cd0b3db786..a3a6051ef0c 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs"; }; - nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 21059c25afb..ba7228f5b96 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -38,7 +38,7 @@ python37Packages.buildPythonApplication rec { xcffib cairocffi-xcffib setuptools - setuptools_scm + setuptools-scm dateutil dbus-python mpd2 diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index c43ff3a313f..791aa6534d2 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -3,7 +3,7 @@ , defcon, fontmath, fontparts, fontpens, fonttools, lxml , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli -, pillow, six, bash, setuptools_scm }: +, pillow, six, bash, setuptools-scm }: buildPythonPackage rec { pname = "nototools"; @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ afdko diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index 74884f36f03..7a3967404c9 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools-scm, six, isPy27 }: buildPythonPackage rec { pname = "FormEncode"; @@ -16,7 +16,7 @@ buildPythonPackage rec { sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; checkInputs = [ dnspython pycountry nose ]; diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index c979104914d..76e8a8401fd 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, fusepy, fuse , openssl }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf ''; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; checkInputs = [ fusepy fuse ]; doCheck = false; # seems to hang, not sure diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index f86151f2f51..9a4dbbab374 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -2,7 +2,7 @@ , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens , brotli, fontmath, mutatormath, booleanoperations , ufoprocessor, ufonormalizer, psautohint, tqdm -, setuptools_scm +, setuptools-scm , pytestCheckHook }: @@ -32,7 +32,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ booleanoperations diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix index 0589caf1e6a..35aa3ecb4d3 100644 --- a/pkgs/development/python-modules/amply/default.nix +++ b/pkgs/development/python-modules/amply/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, setuptools_scm +, setuptools-scm , docutils , pyparsing , pytestCheckHook @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ docutils pyparsing diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index df115cf7c47..4abcec541a0 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools_scm, toml }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm, toml }: buildPythonPackage rec { pname = "ansi2html"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; }; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ six setuptools ]; preCheck = "export PATH=$PATH:$out/bin"; diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 10e2369e12e..5e7ae3860a9 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, setuptools_scm, isPy3k }: +, pytest, setuptools-scm, isPy3k }: buildPythonPackage rec { pname = "apipkg"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest ]; # Fix pytest 4 support. See: https://github.com/pytest-dev/apipkg/issues/14 diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index aafbaa15ffe..cbddf962bd1 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pyfiglet , pillow , wcwidth @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 9ffcba63954..06cfafc134f 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,6 +1,6 @@ { lib , fetchPypi -, setuptools_scm +, setuptools-scm , buildPythonPackage , isPy3k , cython @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "2c194f8a429b8399de64a413a06881ea49f0525cabaa2d78fc132b9e970adc6a"; }; - nativeBuildInputs = [ setuptools_scm astropy-helpers astropy-extension-helpers cython jinja2 ]; + nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ]; propagatedBuildInputs = [ numpy pyerfa ]; checkInputs = [ pytest pytest-astropy ]; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index ecbbfa90911..bb4cf989cdd 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, fetchpatch, buildPythonPackage, - setuptools_scm, toml, six, astroid, pytest + setuptools-scm, toml, six, astroid, pytest }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ setuptools_scm toml six astroid ]; + propagatedBuildInputs = [ setuptools-scm toml six astroid ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 20f54870e1f..ce7566deb30 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - m2r, setuptools_scm, six, attrs }: + m2r, setuptools-scm, six, attrs }: buildPythonPackage rec { version = "20.2.0"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33"; }; - buildInputs = [ m2r setuptools_scm ]; + buildInputs = [ m2r setuptools-scm ]; propagatedBuildInputs = [ six attrs ]; # Some tests require twisetd, but twisted requires Automat to build. 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 6c0d1df81f3..8a9bc228385 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , isPy3k , pytest , pytest-black @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d84e126e2a29e4fde8931ff8131240bbf30a0e7dbcc3897a8dbd8ea5ac11419c"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest pytest-flake8 pytest-black pytestcov ]; # ironically, they fail a linting test, and pytest.ini forces that test suite diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix index 39973e433ee..21444970843 100644 --- a/pkgs/development/python-modules/backports_os/default.nix +++ b/pkgs/development/python-modules/backports_os/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , future , isPy3k , python @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "b472c4933094306ca08ec90b2a8cbb50c34f1fb2767775169a1c1650b7b74630"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; checkInputs = [ hypothesis ]; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix index cc51e23260b..0d1203d28be 100644 --- a/pkgs/development/python-modules/backports_tempfile/default.nix +++ b/pkgs/development/python-modules/backports_tempfile/default.nix @@ -2,7 +2,7 @@ , python , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , backports_weakref }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1c648c452e8770d759bdc5a5e2431209be70d25484e1be24876cf2168722c762"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ backports_weakref ]; diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index a9950eb704f..bf81efce8d8 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, mock }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, mock }: buildPythonPackage rec { pname = "backports.unittest_mock"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mock ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; # does not contain tests doCheck = false; diff --git a/pkgs/development/python-modules/backports_weakref/default.nix b/pkgs/development/python-modules/backports_weakref/default.nix index c04b88a3f32..4db504ac330 100644 --- a/pkgs/development/python-modules/backports_weakref/default.nix +++ b/pkgs/development/python-modules/backports_weakref/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm # , backports , python }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; # checkInputs = [ backports ]; # Requires backports package diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index dcb684a55e0..8ad3534170d 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm +, setuptools-scm , sphinx , hypothesis , py @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ sphinx ]; checkInputs = [ diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 0ce3b8d0eae..bf82df4afa3 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -1,5 +1,5 @@ { stdenv, lib -, buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm, pytestCheckHook +, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, pytestCheckHook , aiohttp , aiohttp-cors , appdirs @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "1cdkrl5vw26iy7s23v2zpr39m6g5xsgxhfhagzzflgfbvdc56s93"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; # Necessary for the tests to pass on Darwin with sandbox enabled. # Black starts a local server and needs to bind a local address. diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix index c747df90f5a..f5f3dda77a4 100644 --- a/pkgs/development/python-modules/booleanoperations/default.nix +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , fonttools, fs, pyclipper, defcon, fontpens -, setuptools_scm, pytest +, setuptools-scm, pytest }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ fonttools diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 776cc4d38e9..534ba3c9af5 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -4,7 +4,7 @@ , fetchPypi , pytestCheckHook , pytest-cov -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest-cov diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 7e79d5c63a3..50f6d33791d 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -14,7 +14,7 @@ , requests , requests-toolbelt , requests-unixsocket -, setuptools_scm +, setuptools-scm , setuptools-scm-git-archive , six , trustme @@ -31,7 +31,7 @@ buildPythonPackage rec { sha256 = "f137d03fd5155b1364bea557a7c98168665c239f6c8cedd8f80e81cdfac01567"; }; - nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; + nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ # install_requires diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index 2ee8eb3bd0c..df50219fb17 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi -, setuptools_scm +, setuptools-scm , cheroot, contextlib2, portend, routes, six, zc_lockfile , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt }: @@ -18,7 +18,7 @@ buildPythonPackage rec { cheroot contextlib2 portend routes six zc_lockfile ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 9a01a030e68..9eebff1b1e6 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPy3k -, setuptools_scm +, setuptools-scm , cheroot, portend, more-itertools, zc_lockfile, routes , jaraco_collections , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services @@ -36,7 +36,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ # required diff --git a/pkgs/development/python-modules/clvm-tools/default.nix b/pkgs/development/python-modules/clvm-tools/default.nix index 365f21e8c36..66856191d40 100644 --- a/pkgs/development/python-modules/clvm-tools/default.nix +++ b/pkgs/development/python-modules/clvm-tools/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "test_cmd_unknown-1_txt" ]; - # give a hint to setuptools_scm on package version + # give a hint to setuptools-scm on package version SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"; meta = with lib; { diff --git a/pkgs/development/python-modules/clvm/default.nix b/pkgs/development/python-modules/clvm/default.nix index f7168832fa4..00bc14e280f 100644 --- a/pkgs/development/python-modules/clvm/default.nix +++ b/pkgs/development/python-modules/clvm/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools-scm ]; - # give a hint to setuptools_scm on package version + # give a hint to setuptools-scm on package version SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index a6b49d32bcb..dee6c2ab499 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k , pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs -, contextlib2 ? null, typing ? null, setuptools_scm +, contextlib2 ? null, typing ? null, setuptools-scm , pytest, mock ? null, pytest-mock , which, glibcLocales }: @@ -27,7 +27,7 @@ buildPythonPackage rec { disabled = !isPy3k; buildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/configparser/4.nix b/pkgs/development/python-modules/configparser/4.nix index cbef6fd2ce7..0f3b6e0b491 100644 --- a/pkgs/development/python-modules/configparser/4.nix +++ b/pkgs/development/python-modules/configparser/4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "configparser"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 47fe88d4e61..a939f6623c9 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm , toml }: @@ -14,7 +14,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index c473f2fb420..f99e17137de 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , pytestrunner -, setuptools_scm +, setuptools-scm , isort , mpmath , strategies @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ isort pytestrunner - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index b6b736e9238..de01f4f7041 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -9,7 +9,7 @@ , django-cache-url , six , django -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "9e3bcea1355ac50a4c9f854f751d214cb17e5f8adf18405a4488d0a1e8945915"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url ]; diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 7342aa3300c..2c678e672a3 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools, setuptools_scm, django, dateutil, whoosh, pysolr +, setuptools, setuptools-scm, django, dateutil, whoosh, pysolr , coverage, mock, nose, geopy, requests }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; propagatedBuildInputs = [ django setuptools ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; postPatch = '' sed -i 's/geopy==/geopy>=/' setup.py diff --git a/pkgs/development/python-modules/dotty-dict/default.nix b/pkgs/development/python-modules/dotty-dict/default.nix index 22d469b9669..a2af0920da9 100644 --- a/pkgs/development/python-modules/dotty-dict/default.nix +++ b/pkgs/development/python-modules/dotty-dict/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-6wA1o2KezYQ5emjx9C8elKvRw0V3oZzT6srTMe58uvA="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; doCheck = false; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 5342ff8da83..45842fb809c 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -3,7 +3,7 @@ , fetchPypi , inflection , ruamel_yaml -, setuptools_scm +, setuptools-scm , six , coreapi , djangorestframework @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 56fb450b3e5..4a4dd279a52 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -4,7 +4,7 @@ , numpy , pandas , pybind11 -, setuptools_scm +, setuptools-scm , pytestrunner , pytestCheckHook }: @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 - setuptools_scm + setuptools-scm pytestrunner ]; diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 3280f5f4bb1..8ed3ef17adb 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, python , fonttools, lxml, fs, unicodedata2 , defcon, fontpens, fontmath, booleanoperations -, pytest, setuptools_scm +, pytest, setuptools-scm }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ booleanoperations diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index a1259b85673..b0035e83844 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools_scm, freetype }: +{ lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools-scm, freetype }: buildPythonPackage rec { pname = "freetype-py"; @@ -16,7 +16,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ freetype ]; diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index b629d48c61f..06139b40c38 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -3,7 +3,7 @@ , fetchPypi , sqlalchemy , shapely -, setuptools_scm +, setuptools-scm , pytest }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "02jbad9vbnjx8bmfvxg77z18nymrry6li8hy9pwi0yiyvwbnycyr"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ sqlalchemy shapely ]; # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index eb7e05afff7..d079b18a30c 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools_scm, cython, pytest }: +{ lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools-scm, cython, pytest }: buildPythonPackage rec { pname = "hmmlearn"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "14fb4ad3fb7529785844a25fae5d32272619fb5973cc02c8784018055470ca01"; }; - buildInputs = [ setuptools_scm cython ]; + buildInputs = [ setuptools-scm cython ]; propagatedBuildInputs = [ numpy scikit-learn ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 5db7d6d0254..5184f83881f 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm , setuptools , pytestCheckHook , freezegun @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "8bf7abd672b867f38b8b04593829b85b9b6199a61ef6586bf3629cc06458ff35"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools ]; checkInputs = [ pytestCheckHook freezegun ]; diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index b8ebce462dc..f81ceabd27e 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm , toml , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73"; }; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index ed113dc6da6..60a960a204c 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools_scm, jaraco_collections, importlib-metadata, toml +, setuptools-scm, jaraco_collections, importlib-metadata, toml }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "irc" ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six importlib-metadata diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index 9054f1f109c..a727e774ec3 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 -, setuptools_scm, toml +, setuptools-scm, toml , more-itertools , pytestCheckHook }: @@ -20,7 +20,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index eac4e2ca328..17bb30e1352 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm +{ buildPythonPackage, fetchPypi, setuptools-scm , six, jaraco_classes, jaraco_text }: @@ -13,7 +13,7 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; doCheck = false; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six jaraco_classes jaraco_text ]; # break dependency cycle diff --git a/pkgs/development/python-modules/jaraco_functools/2.nix b/pkgs/development/python-modules/jaraco_functools/2.nix index e0bbde47d25..e10a11018a5 100644 --- a/pkgs/development/python-modules/jaraco_functools/2.nix +++ b/pkgs/development/python-modules/jaraco_functools/2.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm +, setuptools-scm , more-itertools, backports_functools_lru_cache }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; meta = with lib; { description = "Additional functools in the spirit of stdlib's functools"; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 3fa4de9f3d9..534b18764f3 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm, toml +, setuptools-scm, toml , more-itertools, backports_functools_lru_cache }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "97cf88b46ab544c266e2d81fa17bb183622268722a7dd1a3711ea426e9c26f94"; }; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 91bb83fdb5a..9b34a4c441d 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm +{ lib, buildPythonPackage, fetchPypi, setuptools-scm , inflect, more-itertools, six, pytest }: @@ -13,7 +13,7 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ inflect more-itertools six ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index e378240e6cc..d8ff10d95b6 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm +{ lib, buildPythonPackage, fetchPypi, setuptools-scm , tempora, six }: @@ -13,7 +13,7 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ tempora six ]; # test no longer packaged with pypi diff --git a/pkgs/development/python-modules/jaraco_stream/2.nix b/pkgs/development/python-modules/jaraco_stream/2.nix index e1737083c86..1f5a70477a3 100644 --- a/pkgs/development/python-modules/jaraco_stream/2.nix +++ b/pkgs/development/python-modules/jaraco_stream/2.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, six }: +{ buildPythonPackage, fetchPypi, setuptools-scm, six }: buildPythonPackage rec { pname = "jaraco.stream"; @@ -8,6 +8,6 @@ buildPythonPackage rec { sha256 = "196synw4g76yagcflmavi7wakf5cdgsflmvbj7zs616gv03xbsf2"; }; doCheck = false; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; } diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index f62cb1db8ba..367959e37ff 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, six }: +{ buildPythonPackage, fetchPypi, setuptools-scm, six }: buildPythonPackage rec { pname = "jaraco.stream"; @@ -12,6 +12,6 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; doCheck = false; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; } diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index fb945d5b3f6..3126ab99967 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , importlib-resources , jaraco_functools -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; - nativeBuildInputs =[ setuptools_scm ]; + nativeBuildInputs =[ setuptools-scm ]; propagatedBuildInputs = [ jaraco_functools ] ++ lib.optional (pythonOlder "3.7") [ importlib-resources ]; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 78d2a5f6c8c..a91e6b3accd 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, setuptools_scm +, setuptools-scm , toml , importlib-metadata }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; nativeBuildInputs = [ - setuptools_scm + setuptools-scm toml ]; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index d90040c4269..583936255fd 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -6,7 +6,7 @@ , nose , pyperf , pyrsistent -, setuptools_scm +, setuptools-scm , twisted , vcversioner }: @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; checkInputs = [ nose mock pyperf twisted vcversioner ]; diff --git a/pkgs/development/python-modules/keyring/2.nix b/pkgs/development/python-modules/keyring/2.nix index ee3b42b9bb8..553b649b638 100644 --- a/pkgs/development/python-modules/keyring/2.nix +++ b/pkgs/development/python-modules/keyring/2.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, fetchPypi -, dbus-python, setuptools_scm, entrypoints, secretstorage +, dbus-python, setuptools-scm, entrypoints, secretstorage , pytest, pytest-flake8 }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0f58jq58jhfzlhix7x2zz7c4ycdvcs1z3sgs4lkr4xxx680wrmk7"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest pytest-flake8 ]; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 5b53d201a0b..abcd04a1d30 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six -, pytest, backports_unittest-mock, keyring, setuptools_scm, toml +, pytest, backports_unittest-mock, keyring, setuptools-scm, toml }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "--flake8" "" ''; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 9eaae90f46e..09232cbc624 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; postPatch = '' diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index 1f5596a46cc..731226fdbfb 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-2qNQpILtWLVyREPGUUMhkem5ewyDdDh50JExccaigIU="; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; # Disabling tests for now due to various (transitive) dependencies on modules # from @smarie which are, as of yet, not part of nixpkgs. Also introduces diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 132be56f19b..794b2c8f4ad 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -7,7 +7,7 @@ , pytest , pytestrunner , hypothesis -, setuptools_scm +, setuptools-scm , isPy27 }: @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "pytest>=3.0,<4.0" "pytest" ''; - buildInputs = [ setuptools_scm pytestrunner ]; + buildInputs = [ setuptools-scm pytestrunner ]; checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ hopcroftkarp multiset ]; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index 6b7a02a76eb..c3ce875b4f5 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, pytestrunner, sphinx, setuptools-scm }: buildPythonPackage rec { pname = "measurement"; @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest pytestrunner ]; - nativeBuildInputs = [ sphinx setuptools_scm ]; + nativeBuildInputs = [ sphinx setuptools-scm ]; propagatedBuildInputs = [ sympy ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index e3abdaa7091..bb5ffb7de79 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -3,7 +3,7 @@ , fetchPypi , mecab , swig -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ mecab # for mecab-config swig - setuptools_scm + setuptools-scm ]; buildInputs = [ mecab ]; diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index 020617abebf..e183031b8d9 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytestrunner , pytest }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7"; }; - buildInputs = [ setuptools_scm pytestrunner ]; + buildInputs = [ setuptools-scm pytestrunner ]; checkInputs = [ pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 66e1edd9390..221915efca0 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , hypothesis -, setuptools_scm +, setuptools-scm , six , attrs , py @@ -52,7 +52,7 @@ buildPythonPackage rec { "test_merge" ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix index cb7d57f7530..209d1f09077 100644 --- a/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/pkgs/development/python-modules/nmigen-boards/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , nmigen , setuptools -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1flbcyb2xz174dgqv2964qra80xj2vbzbqwjb27shvxm6knj9ikf"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools nmigen ]; preBuild = '' diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix index b987557d5f6..22422adad92 100644 --- a/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/pkgs/development/python-modules/nmigen-soc/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , nmigen , setuptools -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0afmnfs1ms7p1r4c1nc0sfvlcq36zjwaim7775v5i2vajcn3020c"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools nmigen ]; preBuild = '' diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 89471207c94..ca31e34d297 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm , cython , numpy , msgpack @@ -22,7 +22,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm cython gcc8 ]; diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 45f4a66f260..7b32cbb55bb 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -4,7 +4,7 @@ , tqdm , aiohttp , pytest -, setuptools_scm +, setuptools-scm , pytest-localserver , pytest-socket , pytest-asyncio @@ -21,7 +21,7 @@ buildPythonPackage rec { }; buildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix index fb4ff20b707..d7c635c2fe4 100644 --- a/pkgs/development/python-modules/path.py/2.nix +++ b/pkgs/development/python-modules/path.py/2.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytest , pytest-flake8 , glibcLocales @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytest-flake8 glibcLocales packaging ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ importlib-metadata ] ++ lib.optional isPy27 backports_os diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 5a0322edf65..e49b1ceb462 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytestCheckHook , pytest-flake8 , glibcLocales @@ -21,7 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ pytestCheckHook pytest-flake8 glibcLocales packaging ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index d544f27b988..66bed253cb8 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -3,7 +3,7 @@ , Mako , markdown , setuptools-git -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "9df5d931f25f353c69c46819a3bd03ef96dd286f2a70bb1b93a23a781f91faa1"; }; - nativeBuildInputs = [ setuptools-git setuptools_scm ]; + nativeBuildInputs = [ setuptools-git setuptools-scm ]; propagatedBuildInputs = [ Mako markdown ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index c0aa86a3763..f39caef6e59 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder -, setuptools_scm +, setuptools-scm , importlib-metadata , packaging # Check Inputs @@ -24,7 +24,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index ecb01f252f4..30fa2e1945b 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , lib , fetchPypi -, setuptools_scm +, setuptools-scm , importlib-metadata }: @@ -21,7 +21,7 @@ buildPythonPackage rec { # To prevent infinite recursion with pytest doCheck = false; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 0429519c202..da27dd3cd92 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, pytestcov }: buildPythonPackage rec { pname = "portend"; @@ -14,7 +14,7 @@ buildPythonPackage rec { substituteInPlace pytest.ini --replace "--flake8" "" ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ tempora ]; diff --git a/pkgs/development/python-modules/prettytable/1.nix b/pkgs/development/python-modules/prettytable/1.nix index 0bd18f0721f..8191e9b5f57 100644 --- a/pkgs/development/python-modules/prettytable/1.nix +++ b/pkgs/development/python-modules/prettytable/1.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , glibcLocales -, setuptools_scm +, setuptools-scm , wcwidth }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0wcpp1nkicrswb353yn6xd2x535cpif62nw5rgz33c1wj0wzbdvb"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ wcwidth ]; diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 50b9eb57630..23702f8e8cf 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , glibcLocales -, setuptools_scm +, setuptools-scm , wcwidth , importlib-metadata , pythonOlder @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index cfed6dd74cf..01b249e1c77 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , fonttools , lxml, fs # for fonttools extras -, setuptools_scm +, setuptools-scm , pytestCheckHook, pytestcov, pytest_xdist }: @@ -25,7 +25,7 @@ buildPythonPackage rec { sed -i '/setup(/a \ version="${version}",' setup.py ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ fonttools lxml fs ]; diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix index 6e504951cdb..c8fde03d79d 100644 --- a/pkgs/development/python-modules/pure-eval/default.nix +++ b/pkgs/development/python-modules/pure-eval/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools_scm, toml, pytest }: +{ buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools-scm, toml, pytest }: buildPythonPackage rec { pname = "pure_eval"; @@ -15,7 +15,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ toml ]; checkInputs = [ pytest ]; 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 b5ffc1fc0a5..2f494dcb700 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests , prometheus_client, py-air-control, pytestCheckHook, pytestcov, pytestrunner -, setuptools_scm }: +, setuptools-scm }: buildPythonPackage rec { pname = "py-air-control-exporter"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "ece2e446273542e5c0352c9d6e80d8279132c6ada3649c59e87a711448801a3b"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytestCheckHook pytestcov pytestrunner ]; propagatedBuildInputs = [ flask prometheus_client py-air-control ]; diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 26afa14c1ef..ce7abe4dc27 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "py"; @@ -12,7 +12,7 @@ buildPythonPackage rec { # Circular dependency on pytest doCheck = false; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; pythonImportsCheck = [ "py" diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index dabe85b9043..3a375b8d284 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }: let _arrow-cpp = arrow-cpp.override { python3 = python; }; @@ -12,7 +12,7 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; - nativeBuildInputs = [ cmake cython pkg-config setuptools_scm ]; + nativeBuildInputs = [ cmake cython pkg-config setuptools-scm ]; propagatedBuildInputs = [ numpy six ]; checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 9e8174f9b7f..496ae04876d 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, setuptools-scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; version = "0.21.0"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "4501aa3954fdac7bb4c049894f8aa1f0f4e1c1f50cc2303feef9bbe3aecfe364"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; checkInputs = [ pygccxml ]; doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index 27a2a1d8084..0fe3998b3e8 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, setuptools_scm +, setuptools-scm , cython }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm cython ]; diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index b04276f1f55..ac054bef956 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchPypi, buildPythonPackage , libmediainfo -, setuptools_scm +, setuptools-scm , pytest, glibcLocales }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { "${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0" ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ glibcLocales pytest ]; diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 8cfce9ba43f..099c9e23711 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools_scm, +{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools-scm, setuptools-scm-git-archive , tesseract, cuneiform, isPy3k, substituteAll, pytest, tox }: @@ -23,7 +23,7 @@ buildPythonPackage rec { }) ]; - buildInputs = [ setuptools_scm setuptools-scm-git-archive ]; + buildInputs = [ setuptools-scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ pillow ]; checkInputs = [ pytest tox ]; checkPhase = "pytest"; diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix index bf56d7ca56e..a7f34b9c13a 100644 --- a/pkgs/development/python-modules/pysolr/default.nix +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, requests, mock }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, requests, mock }: buildPythonPackage rec { pname = "pysolr"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 5d5a0de447d..3df836ee562 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -9,7 +9,7 @@ , pytest-remotedata , pytest-openfiles , pytest-arraydiff -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index 629b4292f86..918d53c4fa7 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , black , pytest -, setuptools_scm +, setuptools-scm , toml }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1d339b004f764d6cd0f06e690f6dd748df3d62e6fe1a692d6a5500ac2c5b75a5"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 414cf1ecc9c..648e5c0fbc8 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, pytest, setuptools-scm }: buildPythonPackage rec { pname = "pytest-celery"; diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index 6acdecf5d88..26c22dfa388 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub -, setuptools_scm, pytest, cmake +, setuptools-scm, pytest, cmake }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0kwgp6sqnqnmww5r0dkmyfpi0lmw0iwxz3fnwn2fs8w6bvixzznf"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index bfcda812529..c147996705e 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest , django -, setuptools_scm +, setuptools-scm , django-configurations , pytest_xdist , six @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "26f02c16d36fd4c8672390deebe3413678d89f30720c16efb8b2a6bf63b9041f"; }; - nativeBuildInputs = [ pytest setuptools_scm ]; + nativeBuildInputs = [ pytest setuptools-scm ]; checkInputs = [ pytest django-configurations pytest_xdist six ]; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 2b1ab664a13..01ec38458c9 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -6,7 +6,7 @@ , pytest , pytestCheckHook , numpy -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; buildInputs = [ pytest diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 67f759cb59f..148b2c7185f 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -5,7 +5,7 @@ , pytestcov , pytest-doctestplus , pytestCheckHook -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index f5fd4c5251d..5fdd5c757d4 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }: +{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools-scm, isPy27 }: buildPythonPackage rec { pname = "pytest-flask"; @@ -19,7 +19,7 @@ buildPythonPackage rec { werkzeug ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; meta = with lib; { homepage = "https://github.com/pytest-dev/pytest-flask/"; diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 0cfb8cd6afc..cbba86641c1 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , py , pytest , pytestCheckHook @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 4df30e3f193..78b2de292f1 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, pytest, pytest-metadata, setuptools_scm }: +, pytest, pytest-metadata, setuptools-scm }: buildPythonPackage rec { pname = "pytest-html"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; propagatedBuildInputs = [ pytest-metadata ]; diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 1a03ec2f91d..9f04cbe407d 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, setuptools_scm }: +, pytest, setuptools-scm }: buildPythonPackage rec { pname = "pytest-metadata"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "71b506d49d34e539cc3cfdb7ce2c5f072bea5c953320002c95968e0238f8ecf1"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-mock/2.nix b/pkgs/development/python-modules/pytest-mock/2.nix index d474d281a68..ad1e7f0c3fd 100644 --- a/pkgs/development/python-modules/pytest-mock/2.nix +++ b/pkgs/development/python-modules/pytest-mock/2.nix @@ -5,7 +5,7 @@ , isPy3k , pytest , mock -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (!isPy3k) mock; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index a39e2e716ea..5be8529433f 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest-asyncio , pytestCheckHook -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1z6r3n78bilfzkbxj083p0ib04ia1bhfgnj2qq9x6q4mmykapqm1"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 88b8017e1c0..8c52fa2e698 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -4,7 +4,7 @@ , filelock , pytest , mypy -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1fa55723a4bf1d054fcba1c3bd694215a2a65cc95ab10164f5808afd893f3b11"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index baa5438dfa8..573dbf27511 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -5,7 +5,7 @@ , pytest , pytestCheckHook , psutil -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "179c2911d8aee3441fee051aba08e0d9b4dab61b829ae4811906d5c49a3b0a58"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index c91c3eae4ab..4add58efbca 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytest , pyqt5 }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index b90e8ebef38..0652bcacbcc 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytest , fetchpatch }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 70caefea895..4f2a577bb4d 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -5,7 +5,7 @@ , requests , psutil , pytest -, setuptools_scm +, setuptools-scm , subprocess32 ? null , toml , zc_lockfile @@ -21,7 +21,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm toml ]; diff --git a/pkgs/development/python-modules/pytest-xdist/1.nix b/pkgs/development/python-modules/pytest-xdist/1.nix index fa794f94141..466d86f50f7 100644 --- a/pkgs/development/python-modules/pytest-xdist/1.nix +++ b/pkgs/development/python-modules/pytest-xdist/1.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, execnet, pytest -, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: +, setuptools-scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { pname = "pytest-xdist"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il"; }; - nativeBuildInputs = [ setuptools_scm pytest ]; + nativeBuildInputs = [ setuptools-scm pytest ]; checkInputs = [ pytest filelock ]; propagatedBuildInputs = [ execnet pytest-forked psutil six ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index bbc08fb59df..f87169a630b 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm , pytestCheckHook , filelock , execnet @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "718887296892f92683f6a51f25a3ae584993b06f7076ce1e1fd482e59a8220a2"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 5949840d1e8..0695b49191b 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , psutil , pytest -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "59c739edee7f3f2258e7c77989241698e356c552f5efb28bb46b478616888bf6"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index f30eec15a0a..c764b55d1f1 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py -, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools +, setuptools-scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; checkInputs = [ hypothesis mock ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ lib.optionals (!isPy3k) [ funcsigs ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix index 341d5ac2240..b3e69578d7e 100644 --- a/pkgs/development/python-modules/pytest/5.nix +++ b/pkgs/development/python-modules/pytest/5.nix @@ -12,7 +12,7 @@ , pygments , python , setuptools -, setuptools_scm +, setuptools-scm , six , toml , wcwidth @@ -31,7 +31,7 @@ buildPythonPackage rec { }; checkInputs = [ hypothesis pygments ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ atomicwrites attrs diff --git a/pkgs/development/python-modules/pytestrunner/2.nix b/pkgs/development/python-modules/pytestrunner/2.nix index d6203276b82..bea83146c37 100644 --- a/pkgs/development/python-modules/pytestrunner/2.nix +++ b/pkgs/development/python-modules/pytestrunner/2.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: buildPythonPackage rec { pname = "pytest-runner"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; }; - nativeBuildInputs = [ setuptools_scm pytest ]; + nativeBuildInputs = [ setuptools-scm pytest ]; postPatch = '' rm pytest.ini diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index 6f68bcd0235..897efebf1dc 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: buildPythonPackage rec { pname = "pytest-runner"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ca3f58ff4957e8be6c54c55d575b235725cbbcf4dc0d5091c29c6444cfc8a5fe"; }; - nativeBuildInputs = [ setuptools_scm pytest ]; + nativeBuildInputs = [ setuptools-scm pytest ]; postPatch = '' rm pytest.ini diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index b851ed6b826..95208c7b94b 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -8,7 +8,7 @@ , pytest , pytestcov , pytestrunner -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -23,11 +23,11 @@ buildPythonPackage rec { sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf"; }; - nativeBuildInputs = [ setuptools_scm pkgconfig pytestrunner ]; + nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ]; checkInputs = [ pytest pytestcov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; - # give a hint to setuptools_scm on package version + # give a hint to setuptools-scm on package version preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}" ''; diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 1ad312dd5d6..43ae18741e1 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools_scm }: +{ lib, stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools-scm }: buildPythonPackage rec { pname = "pyusb"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; # Fix the USB backend library lookup diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 3684fee0d22..09f995412fc 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder -, setuptools_scm +, setuptools-scm , six , pytest }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "071e51a8362908ad5a2a12f078185639b98b20b653a56f01679de169d0fa425d"; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 98bed15cfa0..999c6882380 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -10,7 +10,7 @@ , scipy , pytest , pytest-astropy -, setuptools_scm +, setuptools-scm , cython }: @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ]; - nativeBuildInputs = [ astropy-helpers cython astropy-extension-helpers setuptools_scm ]; + nativeBuildInputs = [ astropy-helpers cython astropy-extension-helpers setuptools-scm ]; checkInputs = [ pytest pytest-astropy ]; # Tests must be run in the build directory diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix index 222b4c60c7f..58cdfe646c6 100644 --- a/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/pkgs/development/python-modules/sapi-python-client/default.nix @@ -1,4 +1,4 @@ -{ lib, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: +{ lib, git, setuptools, setuptools-scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: buildPythonPackage rec { pname = "sapi-python-client"; @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # requires API token and an active keboola bucket - nativeBuildInputs = [ git setuptools_scm ]; + nativeBuildInputs = [ git setuptools-scm ]; propagatedBuildInputs = [ setuptools requests boto3 responses ]; diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index 98795eadfd4..5dbb8ca2d10 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: buildPythonPackage rec { pname = "setuptools-scm-git-archive"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/setuptools_scm/2.nix b/pkgs/development/python-modules/setuptools-scm/2.nix index 4cf6f16fedf..4cf6f16fedf 100644 --- a/pkgs/development/python-modules/setuptools_scm/2.nix +++ b/pkgs/development/python-modules/setuptools-scm/2.nix diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index a4cff6d056b..a4cff6d056b 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix diff --git a/pkgs/development/python-modules/sievelib/default.nix b/pkgs/development/python-modules/sievelib/default.nix index 7fd955abd17..de023377c05 100644 --- a/pkgs/development/python-modules/sievelib/default.nix +++ b/pkgs/development/python-modules/sievelib/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, fetchpatch, mock -, future, six, setuptools_scm }: +, future, six, setuptools-scm }: buildPythonPackage rec { pname = "sievelib"; @@ -23,7 +23,7 @@ buildPythonPackage rec { }) ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ future six ]; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index f718b3655f6..ff139523e1f 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools_scm +{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools-scm , pytestCheckHook }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index b7d7f25614d..a8f565aa353 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy3k , fetchPypi -, setuptools_scm +, setuptools-scm , setuptools , requests , lxml @@ -26,7 +26,7 @@ buildPythonPackage rec { snscrape --help ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index daeca60c1e1..4a6f1c1ae9d 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "fbe6dfd66a1aceb7e0203895ff5622775e50266f8d8cfd841fe1500bd3e19018"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. doCheck = false; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index a9548305d3b..c85d967222e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, setuptools_scm +, setuptools-scm , m2r , pyyaml , jsonschema @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1c1bd10d7653912c59a42f727c62cbb7b75f7905ddd9ccc477ebfd1bc69f0cf3"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pyyaml jsonschema m2r sphinxcontrib_httpdomain ]; doCheck = false; diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index 71f114e3528..f529a8a00b0 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -8,7 +8,7 @@ , pure-eval , pygments , pytestCheckHook -, setuptools_scm +, setuptools-scm , toml , typeguard }: @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ git - setuptools_scm + setuptools-scm toml ]; diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 0536b0f2ccd..734bfc64502 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock +, setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock , six, pytz, jaraco_functools, pythonOlder , pytest-flake8, pytestcov, pytest-black, pytest-mypy }: @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.2"; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six pytz jaraco_functools ]; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index c1c0abcec24..4591677cdf9 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27, isPy3k -, pbr, six, futures ? null, monotonic ? null, typing ? null, setuptools_scm +, pbr, six, futures ? null, monotonic ? null, typing ? null, setuptools-scm , pytest, sphinx, tornado, typeguard }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "5bd16ef5d3b985647fe28dfa6f695d343aa26479a04e8792b9d3c8f49e361ae1"; }; - nativeBuildInputs = [ pbr setuptools_scm ]; + nativeBuildInputs = [ pbr setuptools-scm ]; propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ futures monotonic typing ]; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index ddfa83e30f5..bdd6ad24115 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -8,7 +8,7 @@ , numpy , wheel , isPy3k -, setuptools_scm +, setuptools-scm , psutil , pandas }: @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython pybind11 - setuptools_scm + setuptools-scm ]; buildInputs = [ diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 0fc0ffbf2e7..a90b3dcfdf1 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -6,7 +6,7 @@ , py , six , virtualenv -, setuptools_scm +, setuptools-scm , toml , filelock }: @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "tox"; version = "3.23.0"; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; doCheck = false; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index ae89b3ee0b0..b941727189e 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -2,7 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytestCheckHook , pytest-asyncio , pytest-timeout @@ -22,7 +22,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; checkInputs = [ diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 9a246faff51..b78f38c46cf 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -6,7 +6,7 @@ , readme_renderer , requests , requests_toolbelt -, setuptools_scm +, setuptools-scm , tqdm , colorama , rfc3986 @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ importlib-metadata keyring diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index c88fe994ee8..357c09ab4e8 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm }: buildPythonPackage rec { pname = "ufonormalizer"; @@ -12,7 +12,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; meta = with lib; { description = "Script to normalize the XML and other data inside of a UFO"; diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix index b0f5b11ad3a..540aadd9013 100644 --- a/pkgs/development/python-modules/ufoprocessor/default.nix +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , defcon, fonttools, lxml, fs , mutatormath, fontmath, fontparts -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { extension = "zip"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ defcon diff --git a/pkgs/development/python-modules/ujson/2.nix b/pkgs/development/python-modules/ujson/2.nix index 36aa5a020c3..d9ec65c2392 100644 --- a/pkgs/development/python-modules/ujson/2.nix +++ b/pkgs/development/python-modules/ujson/2.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytestCheckHook }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index d93ee9f5af7..ab1f3e2b7ca 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy3k , isPyPy -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; meta = with lib; { homepage = "https://pypi.python.org/pypi/ujson"; diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index 3a45230720e..a9345b374a7 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -2,7 +2,7 @@ , isPy27 , fetchPypi , pytestrunner -, setuptools_scm +, setuptools-scm , singledispatch ? null , pytest , lib @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner - setuptools_scm + setuptools-scm ]; checkInputs = [ diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 01ab42ed9c3..eb720c7f206 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -14,7 +14,7 @@ , pytestCheckHook , pytest-localserver , pytest-subtesthack -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; checkInputs = [ diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index bcd67260153..b25f162baef 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -16,7 +16,7 @@ , pytest-timeout , pytestCheckHook , pythonOlder -, setuptools_scm +, setuptools-scm , six , stdenv }: @@ -31,7 +31,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 6dd32508bef..5524258a7e8 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, substituteAll, stdenv, fetchPypi, numpy, cython, freetype-py, fontconfig, libGL, - setuptools_scm, setuptools-scm-git-archive + setuptools-scm, setuptools-scm-git-archive }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython setuptools_scm setuptools-scm-git-archive + cython setuptools-scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index bda8f59d2ef..b078231c942 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -6,7 +6,7 @@ , numpy , scikit-learn , six -, setuptools_scm +, setuptools-scm , gcc , pytest , pytestcov @@ -28,7 +28,7 @@ buildPythonPackage rec { sha256 = "222d8ffb47f385c43eba45e3f308e605fc9736b2b7137d74979adf1a31e7c8b4"; }; - nativeBuildInputs = [ setuptools_scm gcc ]; + nativeBuildInputs = [ setuptools-scm gcc ]; propagatedBuildInputs = [ cython numpy scikit-learn six ]; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 1819fd5a512..cfb72680fa8 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , six -, setuptools_scm +, setuptools-scm , xorg , python , mock @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; checkInputs = [ mock nose util-linux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ xorg.libX11 ]; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 3d21bbb3fe3..5c43494d28d 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi -, setuptools_scm +, setuptools-scm , asciitree , numpy , fasteners @@ -21,7 +21,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zipp/1.nix b/pkgs/development/python-modules/zipp/1.nix index 0de729928d0..ab960392677 100644 --- a/pkgs/development/python-modules/zipp/1.nix +++ b/pkgs/development/python-modules/zipp/1.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytest , pytest-flake8 , more-itertools @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0v3qayhqv7vyzydpydwcp51bqciw8p2ajddw68x5k8zppc0vx3yk"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index ccb916a147a..7ef26dbd760 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, setuptools-scm , pytest , pytest-flake8 , more-itertools @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"; }; - nativeBuildInputs = [ setuptools_scm toml ]; + nativeBuildInputs = [ setuptools-scm toml ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 06c366529df..8750b61c48f 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -28,7 +28,7 @@ in python3.pkgs.buildPythonPackage rec { inherit pname version disabled src; - nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ pytest diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix index 7f439d9b59e..9ba53881bf3 100644 --- a/pkgs/development/tools/dt-schema/default.nix +++ b/pkgs/development/tools/dt-schema/default.nix @@ -6,7 +6,7 @@ , jsonschema , rfc3987 , setuptools -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d9f88f069068dc5dc7e895785d7172d260cbbc34cab3b52704b20e89b80c6de8"; }; - nativeBuildInputs = [ setuptools_scm git ]; + nativeBuildInputs = [ setuptools-scm git ]; propagatedBuildInputs = [ setuptools ruamel_yaml diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix index 4618906038e..06a8c3e9871 100644 --- a/pkgs/development/tools/misc/tinyprog/default.nix +++ b/pkgs/development/tools/misc/tinyprog/default.nix @@ -28,7 +28,7 @@ with python3Packages; buildPythonApplication rec { pyusb ]; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 9b55b72c2fa..712baf613e4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -210,7 +210,7 @@ lib.makeScope pkgs.newScope (self: { poetry = if __isBootstrap then null else poetryPkg; # The canonical name is setuptools-scm - setuptools-scm = super.setuptools_scm; + setuptools-scm = super.setuptools-scm; __toPluginAble = toPluginAble self; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index b403e9941f3..193e44935b4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -89,7 +89,7 @@ pythonPackages.callPackage # Prevent infinite recursion skipSetupToolsSCM = [ - "setuptools_scm" + "setuptools-scm" "setuptools-scm" "toml" # Toml is an extra for setuptools-scm ]; diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index 464939084c2..9db57d3e0a9 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { ''; propagatedBuildInputs = with python3Packages; [ - setuptools_scm + setuptools-scm setuptools requests chardet diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index 8493d312eb4..cadfa2c9997 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook glib ]; buildInputs = [ gdk-pixbuf gobject-introspection libnotify gtk3 - python3Packages.setuptools_scm + python3Packages.setuptools-scm ]; pythonPath = with python3Packages; [ dbus-python docopt ewmh pygobject3 pyxdg diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index 0c6e9dc0ab2..25d3eaa15fc 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1wh6yidwdk8jvjpr5g3azhqgsk24c5rlzmw6l86dmi0mpvmxm94w"; }; - buildInputs = with python3Packages; [ setuptools setuptools_scm salt ]; + buildInputs = with python3Packages; [ setuptools setuptools-scm salt ]; checkInputs = with python3Packages; [ pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado ]; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 393d9d145c2..88b0e614773 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { $out/bin/simp_le --test ''; - propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; + propagatedBuildInputs = with python3Packages; [ acme setuptools-scm josepy idna ]; checkInputs = with python3Packages; [ mock ]; diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix index c9466f54a62..8a07b2c6c9c 100644 --- a/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/pkgs/tools/misc/adafruit-ampy/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1dz5sksalccv4c3bzk3c1jxpg3s28lwlw8hfwc9dfxhw3a1np3fd"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ click python-dotenv pyserial ]; # No tests diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 460f20a5f5f..69a784ec4cc 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -36,7 +36,7 @@ in with python.pkgs; buildPythonPackage rec { xstatic-pygments ]; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index f82dc0e4bc0..db76c9913f6 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub -, setuptools_scm +, setuptools-scm , vdf , bash , steam-run @@ -27,7 +27,7 @@ buildPythonApplication rec { ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ vdf ]; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index af072de3e14..bc6ca60a9e7 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { license-expression requests setuptools - setuptools_scm + setuptools-scm ]; checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index dbdd94a3d5c..9fd57c82e88 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./sudo.patch ]; - nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ]; + nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ]; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 99e2bf06508..0e13e4c5f35 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -43,7 +43,7 @@ buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ setuptools setuptools-scm-git-archive - setuptools_scm + setuptools-scm ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index dbbe5ca57f1..f11a9dc3c0b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,5 +36,6 @@ mapAliases ({ smart_open = smart-open; # added 2021-03-14 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 - MechanicalSoup = mechanicalsoup; # added 2021-06-01 + MechanicalSoup = mechanicalsoup; # added 2021-06-01 + 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 5444bff767c..31847d1367d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7622,8 +7622,7 @@ in { setuptools-rust = callPackage ../development/python-modules/setuptools-rust { }; - setuptools-scm = self.setuptools_scm; # added 2021-01-04 - setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + setuptools-scm = callPackage ../development/python-modules/setuptools-scm { }; setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 221da6daa9a..bc37fd28db0 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -548,7 +548,7 @@ with self; with super; { setuptools = callPackage ../development/python-modules/setuptools/44.0.nix { }; - setuptools_scm = callPackage ../development/python-modules/setuptools_scm/2.nix { }; + setuptools-scm = callPackage ../development/python-modules/setuptools-scm/2.nix { }; setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; |