Merge pull request #243549 from tjni/jaraco-renames

treewide: rename jaraco_* to jaraco-*

authored by

Robert Schütz and committed by
GitHub
0a5266e1 ba929a02

+92 -70
+1 -1
pkgs/applications/office/fava/default.nix
··· 19 click 20 flask 21 flask-babel 22 - jaraco_functools 23 jinja2 24 markdown2 25 ply
··· 19 click 20 flask 21 flask-babel 22 + jaraco-functools 23 jinja2 24 markdown2 25 ply
+4 -4
pkgs/development/python-modules/cheroot/default.nix
··· 2 , stdenv 3 , buildPythonPackage 4 , fetchPypi 5 - , jaraco_functools 6 - , jaraco_text 7 , more-itertools 8 , portend 9 , pypytools ··· 35 ]; 36 37 propagatedBuildInputs = [ 38 - jaraco_functools 39 more-itertools 40 six 41 ]; 42 43 nativeCheckInputs = [ 44 - jaraco_text 45 portend 46 pypytools 47 pytest-mock
··· 2 , stdenv 3 , buildPythonPackage 4 , fetchPypi 5 + , jaraco-functools 6 + , jaraco-text 7 , more-itertools 8 , portend 9 , pypytools ··· 35 ]; 36 37 propagatedBuildInputs = [ 38 + jaraco-functools 39 more-itertools 40 six 41 ]; 42 43 nativeCheckInputs = [ 44 + jaraco-text 45 portend 46 pypytools 47 pytest-mock
+2 -2
pkgs/development/python-modules/cherrypy/default.nix
··· 3 , buildPythonPackage 4 , cheroot 5 , fetchPypi 6 - , jaraco_collections 7 , more-itertools 8 , objgraph 9 , path ··· 53 portend 54 more-itertools 55 zc_lockfile 56 - jaraco_collections 57 ]; 58 59 nativeCheckInputs = [
··· 3 , buildPythonPackage 4 , cheroot 5 , fetchPypi 6 + , jaraco-collections 7 , more-itertools 8 , objgraph 9 , path ··· 53 portend 54 more-itertools 55 zc_lockfile 56 + jaraco-collections 57 ]; 58 59 nativeCheckInputs = [
+18 -8
pkgs/development/python-modules/irc/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi, isPy3k 2 - , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools 3 - , setuptools-scm, jaraco_collections, importlib-metadata 4 }: 5 6 buildPythonPackage rec { ··· 20 propagatedBuildInputs = [ 21 six 22 importlib-metadata 23 - jaraco_logging 24 - jaraco_text 25 - jaraco_stream 26 pytz 27 - jaraco_itertools 28 - jaraco_collections 29 ]; 30 31 doCheck = false;
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , isPy3k 5 + , six 6 + , jaraco-logging 7 + , jaraco-text 8 + , jaraco-stream 9 + , pytz 10 + , jaraco-itertools 11 + , setuptools-scm 12 + , jaraco-collections 13 + , importlib-metadata 14 }: 15 16 buildPythonPackage rec { ··· 30 propagatedBuildInputs = [ 31 six 32 importlib-metadata 33 + jaraco-logging 34 + jaraco-text 35 + jaraco-stream 36 pytz 37 + jaraco-itertools 38 + jaraco-collections 39 ]; 40 41 doCheck = false;
+6 -6
pkgs/development/python-modules/jaraco-abode/default.nix
··· 5 , fetchFromGitHub 6 , fetchPypi 7 , importlib-resources 8 - , jaraco_classes 9 - , jaraco_collections 10 - , jaraco_itertools 11 , jaraco-context 12 , jaraco-net 13 , keyring ··· 55 colorlog 56 keyring 57 requests-toolbelt 58 - jaraco_collections 59 jaraco-context 60 - jaraco_classes 61 jaraco-net 62 more-itertools 63 importlib-resources 64 bx-py-utils 65 platformdirs 66 - jaraco_itertools 67 ]; 68 69 nativeCheckInputs = [
··· 5 , fetchFromGitHub 6 , fetchPypi 7 , importlib-resources 8 + , jaraco-classes 9 + , jaraco-collections 10 + , jaraco-itertools 11 , jaraco-context 12 , jaraco-net 13 , keyring ··· 55 colorlog 56 keyring 57 requests-toolbelt 58 + jaraco-collections 59 jaraco-context 60 + jaraco-classes 61 jaraco-net 62 more-itertools 63 importlib-resources 64 bx-py-utils 65 platformdirs 66 + jaraco-itertools 67 ]; 68 69 nativeCheckInputs = [
+4 -4
pkgs/development/python-modules/jaraco-email/default.nix
··· 6 , fetchpatch 7 , setuptools 8 , setuptools-scm 9 - , jaraco_text 10 - , jaraco_collections 11 , keyring 12 , pytestCheckHook 13 }: ··· 48 SETUPTOOLS_SCM_PRETEND_VERSION = version; 49 50 propagatedBuildInputs = [ 51 - jaraco_text 52 - jaraco_collections 53 keyring 54 ]; 55
··· 6 , fetchpatch 7 , setuptools 8 , setuptools-scm 9 + , jaraco-text 10 + , jaraco-collections 11 , keyring 12 , pytestCheckHook 13 }: ··· 48 SETUPTOOLS_SCM_PRETEND_VERSION = version; 49 50 propagatedBuildInputs = [ 51 + jaraco-text 52 + jaraco-collections 53 keyring 54 ]; 55
+8 -8
pkgs/development/python-modules/jaraco-net/default.nix
··· 11 , keyring 12 , requests 13 , feedparser 14 - , jaraco_text 15 - , jaraco_logging 16 , jaraco-email 17 - , jaraco_functools 18 - , jaraco_collections 19 , path 20 , python-dateutil 21 , pathvalidate ··· 58 keyring 59 requests 60 feedparser 61 - jaraco_text 62 - jaraco_logging 63 jaraco-email 64 - jaraco_functools 65 - jaraco_collections 66 path 67 python-dateutil 68 pathvalidate
··· 11 , keyring 12 , requests 13 , feedparser 14 + , jaraco-text 15 + , jaraco-logging 16 , jaraco-email 17 + , jaraco-functools 18 + , jaraco-collections 19 , path 20 , python-dateutil 21 , pathvalidate ··· 58 keyring 59 requests 60 feedparser 61 + jaraco-text 62 + jaraco-logging 63 jaraco-email 64 + jaraco-functools 65 + jaraco-collections 66 path 67 python-dateutil 68 pathvalidate
+4 -4
pkgs/development/python-modules/jaraco-test/default.nix
··· 5 , setuptools 6 , setuptools-scm 7 , toml 8 - , jaraco_functools 9 , jaraco-context 10 , more-itertools 11 - , jaraco_collections 12 , pytestCheckHook 13 }: 14 ··· 32 33 propagatedBuildInputs = [ 34 toml 35 - jaraco_functools 36 jaraco-context 37 more-itertools 38 - jaraco_collections 39 ]; 40 41 nativeCheckInputs = [
··· 5 , setuptools 6 , setuptools-scm 7 , toml 8 + , jaraco-functools 9 , jaraco-context 10 , more-itertools 11 + , jaraco-collections 12 , pytestCheckHook 13 }: 14 ··· 32 33 propagatedBuildInputs = [ 34 toml 35 + jaraco-functools 36 jaraco-context 37 more-itertools 38 + jaraco-collections 39 ]; 40 41 nativeCheckInputs = [
+1 -1
pkgs/development/python-modules/jaraco_classes/default.nix pkgs/development/python-modules/jaraco-classes/default.nix
··· 5 }: 6 7 buildPythonPackage rec { 8 - pname = "jaraco.classes"; 9 version = "3.1.1"; 10 disabled = isPy27; 11
··· 5 }: 6 7 buildPythonPackage rec { 8 + pname = "jaraco-classes"; 9 version = "3.1.1"; 10 disabled = isPy27; 11
+7 -6
pkgs/development/python-modules/jaraco_collections/default.nix pkgs/development/python-modules/jaraco-collections/default.nix
··· 3 , fetchPypi 4 , setuptools 5 , setuptools-scm 6 - , jaraco_classes 7 - , jaraco_text 8 }: 9 10 buildPythonPackage rec { 11 - pname = "jaraco.collections"; 12 version = "4.3.0"; 13 format = "pyproject"; 14 15 src = fetchPypi { 16 - inherit pname version; 17 hash = "sha256-dP/CP8z+5N4KLr9VajNnW2o8AD1jNZR9MSKgvIgiyOQ="; 18 }; 19 ··· 30 env.SETUPTOOLS_SCM_PRETEND_VERSION = version; 31 32 propagatedBuildInputs = [ 33 - jaraco_classes 34 - jaraco_text 35 ]; 36 37 pythonNamespaces = [ "jaraco" ];
··· 3 , fetchPypi 4 , setuptools 5 , setuptools-scm 6 + , jaraco-classes 7 + , jaraco-text 8 }: 9 10 buildPythonPackage rec { 11 + pname = "jaraco-collections"; 12 version = "4.3.0"; 13 format = "pyproject"; 14 15 src = fetchPypi { 16 + pname = "jaraco.collections"; 17 + inherit version; 18 hash = "sha256-dP/CP8z+5N4KLr9VajNnW2o8AD1jNZR9MSKgvIgiyOQ="; 19 }; 20 ··· 31 env.SETUPTOOLS_SCM_PRETEND_VERSION = version; 32 33 propagatedBuildInputs = [ 34 + jaraco-classes 35 + jaraco-text 36 ]; 37 38 pythonNamespaces = [ "jaraco" ];
+3 -2
pkgs/development/python-modules/jaraco_functools/default.nix pkgs/development/python-modules/jaraco-functools/default.nix
··· 6 }: 7 8 buildPythonPackage rec { 9 - pname = "jaraco.functools"; 10 version = "3.6.0"; 11 format = "pyproject"; 12 13 src = fetchPypi { 14 - inherit pname version; 15 hash = "sha256-Lho74Rq67O5fWrjdWJY4voMEzEy5E2H+Xmg/S22ft6M="; 16 }; 17
··· 6 }: 7 8 buildPythonPackage rec { 9 + pname = "jaraco-functools"; 10 version = "3.6.0"; 11 format = "pyproject"; 12 13 src = fetchPypi { 14 + pname = "jaraco.functools"; 15 + inherit version; 16 hash = "sha256-Lho74Rq67O5fWrjdWJY4voMEzEy5E2H+Xmg/S22ft6M="; 17 }; 18
+3 -2
pkgs/development/python-modules/jaraco_itertools/default.nix pkgs/development/python-modules/jaraco-itertools/default.nix
··· 3 }: 4 5 buildPythonPackage rec { 6 - pname = "jaraco.itertools"; 7 version = "6.2.1"; 8 format = "pyproject"; 9 10 src = fetchPypi { 11 - inherit pname version; 12 hash = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; 13 }; 14
··· 3 }: 4 5 buildPythonPackage rec { 6 + pname = "jaraco-itertools"; 7 version = "6.2.1"; 8 format = "pyproject"; 9 10 src = fetchPypi { 11 + pname = "jaraco.itertools"; 12 + inherit version; 13 hash = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; 14 }; 15
pkgs/development/python-modules/jaraco_logging/default.nix pkgs/development/python-modules/jaraco-logging/default.nix
+3 -2
pkgs/development/python-modules/jaraco_stream/default.nix pkgs/development/python-modules/jaraco-stream/default.nix
··· 1 { buildPythonPackage, fetchPypi, setuptools-scm, six }: 2 3 buildPythonPackage rec { 4 - pname = "jaraco.stream"; 5 version = "3.0.3"; 6 7 src = fetchPypi { 8 - inherit pname version; 9 sha256 = "3af4b0441090ee65bd6dde930d29f93f50c4a2fe6048e2a9d288285f5e4dc441"; 10 }; 11
··· 1 { buildPythonPackage, fetchPypi, setuptools-scm, six }: 2 3 buildPythonPackage rec { 4 + pname = "jaraco-stream"; 5 version = "3.0.3"; 6 7 src = fetchPypi { 8 + pname = "jaraco.stream"; 9 + inherit version; 10 sha256 = "3af4b0441090ee65bd6dde930d29f93f50c4a2fe6048e2a9d288285f5e4dc441"; 11 }; 12
+5 -4
pkgs/development/python-modules/jaraco_text/default.nix pkgs/development/python-modules/jaraco-text/default.nix
··· 4 , pythonOlder 5 , autocommand 6 , importlib-resources 7 - , jaraco_functools 8 , jaraco-context 9 , inflect 10 , pathlib2 ··· 13 }: 14 15 buildPythonPackage rec { 16 - pname = "jaraco.text"; 17 version = "3.11.1"; 18 format = "pyproject"; 19 20 disabled = pythonOlder "3.6"; 21 22 src = fetchPypi { 23 - inherit pname version; 24 hash = "sha256-Mzpd8hSPcTlxhgfN81L+HZUWKXGnKZw4Dcwk2rAWiYA="; 25 }; 26 ··· 35 propagatedBuildInputs = [ 36 autocommand 37 jaraco-context 38 - jaraco_functools 39 inflect 40 ] ++ lib.optionals (pythonOlder "3.9") [ 41 importlib-resources
··· 4 , pythonOlder 5 , autocommand 6 , importlib-resources 7 + , jaraco-functools 8 , jaraco-context 9 , inflect 10 , pathlib2 ··· 13 }: 14 15 buildPythonPackage rec { 16 + pname = "jaraco-text"; 17 version = "3.11.1"; 18 format = "pyproject"; 19 20 disabled = pythonOlder "3.6"; 21 22 src = fetchPypi { 23 + pname = "jaraco.text"; 24 + inherit version; 25 hash = "sha256-Mzpd8hSPcTlxhgfN81L+HZUWKXGnKZw4Dcwk2rAWiYA="; 26 }; 27 ··· 36 propagatedBuildInputs = [ 37 autocommand 38 jaraco-context 39 + jaraco-functools 40 inflect 41 ] ++ lib.optionals (pythonOlder "3.9") [ 42 importlib-resources
+2 -2
pkgs/development/python-modules/keyring/default.nix
··· 6 , setuptools-scm 7 , importlib-metadata 8 , dbus-python 9 - , jaraco_classes 10 , jeepney 11 , secretstorage 12 , pytestCheckHook ··· 28 ]; 29 30 propagatedBuildInputs = [ 31 - jaraco_classes 32 ] ++ lib.optionals stdenv.isLinux [ 33 jeepney 34 secretstorage
··· 6 , setuptools-scm 7 , importlib-metadata 8 , dbus-python 9 + , jaraco-classes 10 , jeepney 11 , secretstorage 12 , pytestCheckHook ··· 28 ]; 29 30 propagatedBuildInputs = [ 31 + jaraco-classes 32 ] ++ lib.optionals stdenv.isLinux [ 33 jeepney 34 secretstorage
+2 -2
pkgs/development/python-modules/scancode-toolkit/default.nix
··· 23 , html5lib 24 , importlib-metadata 25 , intbitset 26 - , jaraco_functools 27 , javaproperties 28 , jinja2 29 , jsonstreams ··· 94 html5lib 95 importlib-metadata 96 intbitset 97 - jaraco_functools 98 javaproperties 99 jinja2 100 jsonstreams
··· 23 , html5lib 24 , importlib-metadata 25 , intbitset 26 + , jaraco-functools 27 , javaproperties 28 , jinja2 29 , jsonstreams ··· 94 html5lib 95 importlib-metadata 96 intbitset 97 + jaraco-functools 98 javaproperties 99 jinja2 100 jsonstreams
+2 -2
pkgs/development/python-modules/tempora/default.nix
··· 8 9 # runtime 10 , pytz 11 - , jaraco_functools 12 13 # tests 14 , freezegun ··· 33 ]; 34 35 propagatedBuildInputs = [ 36 - jaraco_functools 37 pytz 38 ]; 39
··· 8 9 # runtime 10 , pytz 11 + , jaraco-functools 12 13 # tests 14 , freezegun ··· 33 ]; 34 35 propagatedBuildInputs = [ 36 + jaraco-functools 37 pytz 38 ]; 39
+2 -2
pkgs/development/python-modules/zipp/default.nix
··· 2 , buildPythonPackage 3 , fetchPypi 4 , func-timeout 5 - , jaraco_itertools 6 , pythonOlder 7 , setuptools-scm 8 }: ··· 28 29 nativeCheckInputs = [ 30 func-timeout 31 - jaraco_itertools 32 ]; 33 34 pythonImportsCheck = [
··· 2 , buildPythonPackage 3 , fetchPypi 4 , func-timeout 5 + , jaraco-itertools 6 , pythonOlder 7 , setuptools-scm 8 }: ··· 28 29 nativeCheckInputs = [ 30 func-timeout 31 + jaraco-itertools 32 ]; 33 34 pythonImportsCheck = [
+8 -1
pkgs/top-level/python-aliases.nix
··· 154 intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 155 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 156 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 157 - itanium_demangler = itanium-demangler; # added 2022-1017 158 JayDeBeApi = jaydebeapi; # added 2023-02-19 159 jinja2_time = jinja2-time; # added 2022-11-07 160 JPype1 = jpype1; # added 2023-02-19
··· 154 intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 155 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 156 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 157 + itanium_demangler = itanium-demangler; # added 2022-10-17 158 + jaraco_classes = jaraco-classes; # added 2023-07-14 159 + jaraco_collections = jaraco-collections; # added 2023-07-14 160 + jaraco_functools = jaraco-functools; # added 2023-07-14 161 + jaraco_itertools = jaraco-itertools; # added 2023-07-14 162 + jaraco_logging = jaraco-logging; # added 2023-07-14 163 + jaraco_text = jaraco-text; # added 2023-07-14 164 + jaraco_stream = jaraco-stream; # added 2023-07-14 165 JayDeBeApi = jaydebeapi; # added 2023-02-19 166 jinja2_time = jinja2-time; # added 2022-11-07 167 JPype1 = jpype1; # added 2023-02-19
+7 -7
pkgs/top-level/python-packages.nix
··· 5237 5238 jaraco-abode = callPackage ../development/python-modules/jaraco-abode { }; 5239 5240 - jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; 5241 5242 - jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; 5243 5244 jaraco-email = callPackage ../development/python-modules/jaraco-email { }; 5245 5246 jaraco-context = callPackage ../development/python-modules/jaraco-context { }; 5247 5248 - jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; 5249 5250 - jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; 5251 5252 - jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; 5253 5254 jaraco-net = callPackage ../development/python-modules/jaraco-net { }; 5255 5256 - jaraco_stream = callPackage ../development/python-modules/jaraco_stream { }; 5257 5258 jaraco-test = callPackage ../development/python-modules/jaraco-test { }; 5259 5260 - jaraco_text = callPackage ../development/python-modules/jaraco_text { }; 5261 5262 jarowinkler = callPackage ../development/python-modules/jarowinkler { }; 5263
··· 5237 5238 jaraco-abode = callPackage ../development/python-modules/jaraco-abode { }; 5239 5240 + jaraco-classes = callPackage ../development/python-modules/jaraco-classes { }; 5241 5242 + jaraco-collections = callPackage ../development/python-modules/jaraco-collections { }; 5243 5244 jaraco-email = callPackage ../development/python-modules/jaraco-email { }; 5245 5246 jaraco-context = callPackage ../development/python-modules/jaraco-context { }; 5247 5248 + jaraco-functools = callPackage ../development/python-modules/jaraco-functools { }; 5249 5250 + jaraco-itertools = callPackage ../development/python-modules/jaraco-itertools { }; 5251 5252 + jaraco-logging = callPackage ../development/python-modules/jaraco-logging { }; 5253 5254 jaraco-net = callPackage ../development/python-modules/jaraco-net { }; 5255 5256 + jaraco-stream = callPackage ../development/python-modules/jaraco-stream { }; 5257 5258 jaraco-test = callPackage ../development/python-modules/jaraco-test { }; 5259 5260 + jaraco-text = callPackage ../development/python-modules/jaraco-text { }; 5261 5262 jarowinkler = callPackage ../development/python-modules/jarowinkler { }; 5263