Merge pull request #243549 from tjni/jaraco-renames

treewide: rename jaraco_* to jaraco-*
This commit is contained in:
Robert Schütz 2023-07-23 11:39:19 -07:00 committed by GitHub
commit 0a5266e136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 92 additions and 70 deletions

View File

@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
click
flask
flask-babel
jaraco_functools
jaraco-functools
jinja2
markdown2
ply

View File

@ -2,8 +2,8 @@
, stdenv
, buildPythonPackage
, fetchPypi
, jaraco_functools
, jaraco_text
, jaraco-functools
, jaraco-text
, more-itertools
, portend
, pypytools
@ -35,13 +35,13 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
jaraco_functools
jaraco-functools
more-itertools
six
];
nativeCheckInputs = [
jaraco_text
jaraco-text
portend
pypytools
pytest-mock

View File

@ -3,7 +3,7 @@
, buildPythonPackage
, cheroot
, fetchPypi
, jaraco_collections
, jaraco-collections
, more-itertools
, objgraph
, path
@ -53,7 +53,7 @@ buildPythonPackage rec {
portend
more-itertools
zc_lockfile
jaraco_collections
jaraco-collections
];
nativeCheckInputs = [

View File

@ -1,6 +1,16 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools
, setuptools-scm, jaraco_collections, importlib-metadata
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, six
, jaraco-logging
, jaraco-text
, jaraco-stream
, pytz
, jaraco-itertools
, setuptools-scm
, jaraco-collections
, importlib-metadata
}:
buildPythonPackage rec {
@ -20,12 +30,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [
six
importlib-metadata
jaraco_logging
jaraco_text
jaraco_stream
jaraco-logging
jaraco-text
jaraco-stream
pytz
jaraco_itertools
jaraco_collections
jaraco-itertools
jaraco-collections
];
doCheck = false;

View File

@ -5,9 +5,9 @@
, fetchFromGitHub
, fetchPypi
, importlib-resources
, jaraco_classes
, jaraco_collections
, jaraco_itertools
, jaraco-classes
, jaraco-collections
, jaraco-itertools
, jaraco-context
, jaraco-net
, keyring
@ -55,15 +55,15 @@ buildPythonPackage rec {
colorlog
keyring
requests-toolbelt
jaraco_collections
jaraco-collections
jaraco-context
jaraco_classes
jaraco-classes
jaraco-net
more-itertools
importlib-resources
bx-py-utils
platformdirs
jaraco_itertools
jaraco-itertools
];
nativeCheckInputs = [

View File

@ -5,7 +5,7 @@
}:
buildPythonPackage rec {
pname = "jaraco.classes";
pname = "jaraco-classes";
version = "3.1.1";
disabled = isPy27;

View File

@ -3,17 +3,18 @@
, fetchPypi
, setuptools
, setuptools-scm
, jaraco_classes
, jaraco_text
, jaraco-classes
, jaraco-text
}:
buildPythonPackage rec {
pname = "jaraco.collections";
pname = "jaraco-collections";
version = "4.3.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
pname = "jaraco.collections";
inherit version;
hash = "sha256-dP/CP8z+5N4KLr9VajNnW2o8AD1jNZR9MSKgvIgiyOQ=";
};
@ -30,8 +31,8 @@ buildPythonPackage rec {
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
propagatedBuildInputs = [
jaraco_classes
jaraco_text
jaraco-classes
jaraco-text
];
pythonNamespaces = [ "jaraco" ];

View File

@ -6,8 +6,8 @@
, fetchpatch
, setuptools
, setuptools-scm
, jaraco_text
, jaraco_collections
, jaraco-text
, jaraco-collections
, keyring
, pytestCheckHook
}:
@ -48,8 +48,8 @@ buildPythonPackage rec {
SETUPTOOLS_SCM_PRETEND_VERSION = version;
propagatedBuildInputs = [
jaraco_text
jaraco_collections
jaraco-text
jaraco-collections
keyring
];

View File

@ -6,12 +6,13 @@
}:
buildPythonPackage rec {
pname = "jaraco.functools";
pname = "jaraco-functools";
version = "3.6.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
pname = "jaraco.functools";
inherit version;
hash = "sha256-Lho74Rq67O5fWrjdWJY4voMEzEy5E2H+Xmg/S22ft6M=";
};

View File

@ -3,12 +3,13 @@
}:
buildPythonPackage rec {
pname = "jaraco.itertools";
pname = "jaraco-itertools";
version = "6.2.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
pname = "jaraco.itertools";
inherit version;
hash = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw=";
};

View File

@ -11,11 +11,11 @@
, keyring
, requests
, feedparser
, jaraco_text
, jaraco_logging
, jaraco-text
, jaraco-logging
, jaraco-email
, jaraco_functools
, jaraco_collections
, jaraco-functools
, jaraco-collections
, path
, python-dateutil
, pathvalidate
@ -58,11 +58,11 @@ buildPythonPackage rec {
keyring
requests
feedparser
jaraco_text
jaraco_logging
jaraco-text
jaraco-logging
jaraco-email
jaraco_functools
jaraco_collections
jaraco-functools
jaraco-collections
path
python-dateutil
pathvalidate

View File

@ -1,11 +1,12 @@
{ buildPythonPackage, fetchPypi, setuptools-scm, six }:
buildPythonPackage rec {
pname = "jaraco.stream";
pname = "jaraco-stream";
version = "3.0.3";
src = fetchPypi {
inherit pname version;
pname = "jaraco.stream";
inherit version;
sha256 = "3af4b0441090ee65bd6dde930d29f93f50c4a2fe6048e2a9d288285f5e4dc441";
};

View File

@ -5,10 +5,10 @@
, setuptools
, setuptools-scm
, toml
, jaraco_functools
, jaraco-functools
, jaraco-context
, more-itertools
, jaraco_collections
, jaraco-collections
, pytestCheckHook
}:
@ -32,10 +32,10 @@ buildPythonPackage rec {
propagatedBuildInputs = [
toml
jaraco_functools
jaraco-functools
jaraco-context
more-itertools
jaraco_collections
jaraco-collections
];
nativeCheckInputs = [

View File

@ -4,7 +4,7 @@
, pythonOlder
, autocommand
, importlib-resources
, jaraco_functools
, jaraco-functools
, jaraco-context
, inflect
, pathlib2
@ -13,14 +13,15 @@
}:
buildPythonPackage rec {
pname = "jaraco.text";
pname = "jaraco-text";
version = "3.11.1";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
pname = "jaraco.text";
inherit version;
hash = "sha256-Mzpd8hSPcTlxhgfN81L+HZUWKXGnKZw4Dcwk2rAWiYA=";
};
@ -35,7 +36,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
autocommand
jaraco-context
jaraco_functools
jaraco-functools
inflect
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources

View File

@ -6,7 +6,7 @@
, setuptools-scm
, importlib-metadata
, dbus-python
, jaraco_classes
, jaraco-classes
, jeepney
, secretstorage
, pytestCheckHook
@ -28,7 +28,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
jaraco_classes
jaraco-classes
] ++ lib.optionals stdenv.isLinux [
jeepney
secretstorage

View File

@ -23,7 +23,7 @@
, html5lib
, importlib-metadata
, intbitset
, jaraco_functools
, jaraco-functools
, javaproperties
, jinja2
, jsonstreams
@ -94,7 +94,7 @@ buildPythonPackage rec {
html5lib
importlib-metadata
intbitset
jaraco_functools
jaraco-functools
javaproperties
jinja2
jsonstreams

View File

@ -8,7 +8,7 @@
# runtime
, pytz
, jaraco_functools
, jaraco-functools
# tests
, freezegun
@ -33,7 +33,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
jaraco_functools
jaraco-functools
pytz
];

View File

@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, func-timeout
, jaraco_itertools
, jaraco-itertools
, pythonOlder
, setuptools-scm
}:
@ -28,7 +28,7 @@ let zipp = buildPythonPackage rec {
nativeCheckInputs = [
func-timeout
jaraco_itertools
jaraco-itertools
];
pythonImportsCheck = [

View File

@ -154,7 +154,14 @@ mapAliases ({
intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11
ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30
influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10
itanium_demangler = itanium-demangler; # added 2022-1017
itanium_demangler = itanium-demangler; # added 2022-10-17
jaraco_classes = jaraco-classes; # added 2023-07-14
jaraco_collections = jaraco-collections; # added 2023-07-14
jaraco_functools = jaraco-functools; # added 2023-07-14
jaraco_itertools = jaraco-itertools; # added 2023-07-14
jaraco_logging = jaraco-logging; # added 2023-07-14
jaraco_text = jaraco-text; # added 2023-07-14
jaraco_stream = jaraco-stream; # added 2023-07-14
JayDeBeApi = jaydebeapi; # added 2023-02-19
jinja2_time = jinja2-time; # added 2022-11-07
JPype1 = jpype1; # added 2023-02-19

View File

@ -5237,27 +5237,27 @@ self: super: with self; {
jaraco-abode = callPackage ../development/python-modules/jaraco-abode { };
jaraco_classes = callPackage ../development/python-modules/jaraco_classes { };
jaraco-classes = callPackage ../development/python-modules/jaraco-classes { };
jaraco_collections = callPackage ../development/python-modules/jaraco_collections { };
jaraco-collections = callPackage ../development/python-modules/jaraco-collections { };
jaraco-email = callPackage ../development/python-modules/jaraco-email { };
jaraco-context = callPackage ../development/python-modules/jaraco-context { };
jaraco_functools = callPackage ../development/python-modules/jaraco_functools { };
jaraco-functools = callPackage ../development/python-modules/jaraco-functools { };
jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { };
jaraco-itertools = callPackage ../development/python-modules/jaraco-itertools { };
jaraco_logging = callPackage ../development/python-modules/jaraco_logging { };
jaraco-logging = callPackage ../development/python-modules/jaraco-logging { };
jaraco-net = callPackage ../development/python-modules/jaraco-net { };
jaraco_stream = callPackage ../development/python-modules/jaraco_stream { };
jaraco-stream = callPackage ../development/python-modules/jaraco-stream { };
jaraco-test = callPackage ../development/python-modules/jaraco-test { };
jaraco_text = callPackage ../development/python-modules/jaraco_text { };
jaraco-text = callPackage ../development/python-modules/jaraco-text { };
jarowinkler = callPackage ../development/python-modules/jarowinkler { };