python39Packages.ruamel-yaml: normalise name, adopt

2021-11-01 21:59:40 +01:00 · 2021-11-01 21:59:40 +01:00 · b2767b69dd
parent e91d4957d0
commit b2767b69dd
31 changed files with 61 additions and 66 deletions
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@ -30,7 +30,7 @@
 , pytestCheckHook
 , pythonOlder
 , requests
-, ruamel_yaml
+, ruamel-yaml
 , stdenv
 , toml
 , typogrify
@ -75,7 +75,7 @@ buildPythonPackage rec {
    pyphen
    PyRSS2Gen
    requests
-    ruamel_yaml
+    ruamel-yaml
    toml
    typogrify
    unidecode
--- a/pkgs/development/python-modules/conda/default.nix
+++ b/pkgs/development/python-modules/conda/default.nix
@ -3,7 +3,7 @@
 , fetchPypi
 , pycosat
 , requests
-, ruamel_yaml
+, ruamel-yaml
 , isPy3k
 , enum34
 }:
@ -20,7 +20,7 @@ buildPythonPackage rec {
    sha256 = "a91ef821343dea3ba9670f3d10b36c1ace4f4c36d70c175d8fc8886e94285953";
  };

-  propagatedBuildInputs = [ pycosat requests ruamel_yaml ] ++ lib.optional (!isPy3k) enum34;
+  propagatedBuildInputs = [ pycosat requests ruamel-yaml ] ++ lib.optional (!isPy3k) enum34;

  # No tests
  doCheck = false;
--- a/pkgs/development/python-modules/construct/2.10.54.nix
+++ b/pkgs/development/python-modules/construct/2.10.54.nix
@ -1,5 +1,5 @@
 { lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
-, six, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel_yaml
+, six, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel-yaml
 }:

 buildPythonPackage rec {
@ -14,7 +14,7 @@ buildPythonPackage rec {
    sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48";
  };

-  checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy arrow ruamel_yaml ];
+  checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy arrow ruamel-yaml ];

  disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];

--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@ -1,5 +1,5 @@
 { lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
-, six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel_yaml
+, six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel-yaml
 , lz4, cloudpickle
 }:

@ -22,7 +22,7 @@ buildPythonPackage rec {
    lz4
  ];

-  checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml cloudpickle ];
+  checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel-yaml cloudpickle ];

  disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];

--- a/pkgs/development/python-modules/dateparser/0.x.nix
+++ b/pkgs/development/python-modules/dateparser/0.x.nix
@ -11,7 +11,7 @@
 , convertdate
 , umalqurra
 , jdatetime
-, ruamel_yaml
+, ruamel-yaml
 }:

 buildPythonPackage rec {
@ -41,7 +41,7 @@ buildPythonPackage rec {
    # install_requires
    python-dateutil pytz regex tzlocal
    # extra_requires
-    convertdate umalqurra jdatetime ruamel_yaml
+    convertdate umalqurra jdatetime ruamel-yaml
  ];

  pythonImportsCheck = [ "dateparser" ];
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@ -14,7 +14,7 @@
 , parameterized
 , pytestCheckHook
 , GitPython
-, ruamel_yaml
+, ruamel-yaml
 }:

 buildPythonPackage rec {
@ -41,7 +41,7 @@ buildPythonPackage rec {
    parameterized
    pytestCheckHook
    GitPython
-    ruamel_yaml
+    ruamel-yaml
  ];

  preCheck = ''
--- a/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/pkgs/development/python-modules/drf-yasg/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , inflection
-, ruamel_yaml
+, ruamel-yaml
 , setuptools-scm
 , six
 , coreapi
@ -33,7 +33,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    six
    inflection
-    ruamel_yaml
+    ruamel-yaml
    coreapi
    djangorestframework
  ];
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, ruamel_yaml
+, ruamel-yaml
 , xmltodict
 , pygments
 , pytestCheckHook
@ -20,7 +20,7 @@ buildPythonPackage rec {
    sha256 = "sha256-ISggj6oOF0B7TKIQAlZtauRrDAWP88OOFezLJK6edjI=";
  };

-  propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
+  propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

  checkInputs = [ pytestCheckHook ];

--- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
@ -5,7 +5,7 @@
 , pkgs-docker
 , python-json-logger
 , pyyaml
-, ruamel_yaml
+, ruamel-yaml
 , semver
 , toml
 , traitlets
@ -27,7 +27,7 @@ buildPythonPackage rec {
    jinja2
    pkgs-docker
    python-json-logger
-    ruamel_yaml
+    ruamel-yaml
    semver
    toml
    traitlets
--- a/pkgs/development/python-modules/jupyter-telemetry/default.nix
+++ b/pkgs/development/python-modules/jupyter-telemetry/default.nix
@ -4,7 +4,7 @@
 , pythonOlder
 , python-json-logger
 , jsonschema
-, ruamel_yaml
+, ruamel-yaml
 , traitlets
 }:

@ -19,7 +19,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
-    python-json-logger jsonschema ruamel_yaml traitlets
+    python-json-logger jsonschema ruamel-yaml traitlets
  ];

  meta = with lib; {
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder
-, sqlalchemy, ruamel_yaml, CommonMark, lxml
+, sqlalchemy, ruamel-yaml, CommonMark, lxml
 }:

 buildPythonPackage rec {
@ -16,7 +16,7 @@ buildPythonPackage rec {

    # defined in optional-requirements.txt
    sqlalchemy
-    ruamel_yaml
+    ruamel-yaml
    CommonMark
    lxml
  ];
--- a/pkgs/development/python-modules/maya/default.nix
+++ b/pkgs/development/python-modules/maya/default.nix
@ -1,5 +1,5 @@
 { lib, fetchPypi, fetchpatch, buildPythonPackage
-, dateparser, humanize, pendulum, ruamel_yaml, tzlocal }:
+, dateparser, humanize, pendulum, ruamel-yaml, tzlocal }:

 buildPythonPackage rec {
  pname = "maya";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    })
  ];

-  propagatedBuildInputs = [ dateparser humanize pendulum ruamel_yaml tzlocal ];
+  propagatedBuildInputs = [ dateparser humanize pendulum ruamel-yaml tzlocal ];

  # No tests
  doCheck = false;
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@ -24,7 +24,7 @@
 , pyopenssl
 , pyparsing
 , pyperclip
-, ruamel_yaml
+, ruamel-yaml
 , setuptools
 , sortedcontainers
 , tornado
@ -78,7 +78,7 @@ buildPythonPackage rec {
    pyopenssl
    pyparsing
    pyperclip
-    ruamel_yaml
+    ruamel-yaml
    sortedcontainers
    tornado
    urwid
--- a/pkgs/development/python-modules/monty/default.nix
+++ b/pkgs/development/python-modules/monty/default.nix
@ -8,7 +8,7 @@
 , pandas
 , pydantic
 , pymongo
-, ruamel_yaml
+, ruamel-yaml
 , tqdm
 }:

@ -30,7 +30,7 @@ buildPythonPackage rec {
  '';

  propagatedBuildInputs = [
-    ruamel_yaml
+    ruamel-yaml
    tqdm
    msgpack
  ];
--- a/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/pkgs/development/python-modules/ntc-templates/default.nix
@ -5,7 +5,7 @@
 , poetry-core
 , textfsm
 , pytestCheckHook
-, ruamel_yaml
+, ruamel-yaml
 , yamllint
 }:

@ -32,7 +32,7 @@ buildPythonPackage rec {

  checkInputs = [
    pytestCheckHook
-    ruamel_yaml
+    ruamel-yaml
    yamllint
  ];

--- a/pkgs/development/python-modules/prance/default.nix
+++ b/pkgs/development/python-modules/prance/default.nix
@ -3,7 +3,7 @@
 , fetchFromGitHub
 , chardet
 , requests
-, ruamel_yaml
+, ruamel-yaml
 , six
 , semver
 , pytestCheckHook
@ -25,7 +25,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    chardet
    requests
-    ruamel_yaml
+    ruamel-yaml
    six
    semver
  ];
--- a/pkgs/development/python-modules/pre-commit-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix
@ -4,7 +4,7 @@
 , git
 , pythonOlder
 , pytestCheckHook
-, ruamel_yaml
+, ruamel-yaml
 , toml
 }:

@ -21,7 +21,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
-    ruamel_yaml
+    ruamel-yaml
    toml
  ];

--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@ -10,7 +10,7 @@
 , plotly
 , pydispatcher
 , requests
-, ruamel_yaml
+, ruamel-yaml
 , scipy
 , six
 , spglib
@ -41,7 +41,7 @@ buildPythonPackage rec {
    plotly
    pydispatcher
    requests
-    ruamel_yaml
+    ruamel-yaml
    scipy
    six
    spglib
--- a/pkgs/development/python-modules/python-box/default.nix
+++ b/pkgs/development/python-modules/python-box/default.nix
@ -5,7 +5,7 @@
 , pytestCheckHook
 , pythonOlder
 , pyyaml
-, ruamel_yaml
+, ruamel-yaml
 , toml
 }:

@ -24,7 +24,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    msgpack
    pyyaml
-    ruamel_yaml
+    ruamel-yaml
    toml
  ];

--- a/pkgs/development/python-modules/pyuavcan/default.nix
+++ b/pkgs/development/python-modules/pyuavcan/default.nix
@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, nunavut
-, pyserial , pytest, ruamel_yaml}:
+, pyserial , pytest, ruamel-yaml}:

 buildPythonPackage rec {
  pname = "pyuavcan";
@ -18,7 +18,7 @@
    nunavut
    pyserial
    pytest
-    ruamel_yaml
+    ruamel-yaml
  ];

  # allow for writable directory for darwin
--- a/pkgs/development/python-modules/ruamel-yaml/0.16.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/0.16.nix
@ -9,11 +9,12 @@
 }:

 buildPythonPackage rec {
-  pname = "ruamel.yaml";
+  pname = "ruamel-yaml";
  version = "0.16.13";

  src = fetchPypi {
-    inherit pname version;
+    pname = "ruamel.yaml";
+    inherit version;
    sha256 = "0hm9yg785f46bkrgqknd6fdvmkby9dpzjnm0b63qf0i748acaj5v";
  };

@ -26,10 +27,7 @@ buildPythonPackage rec {

  # causes namespace clash on py27
  dontUsePythonImportsCheck = isPy27;
-  pythonImportsCheck = [
-    "ruamel.yaml"
-    "ruamel.base"
-  ];
+  pythonImportsCheck = [ "ruamel.yaml" ];

  meta = with lib; {
    description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
--- a/pkgs/development/python-modules/ruamel-yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/default.nix
@ -7,11 +7,12 @@
 }:

 buildPythonPackage rec {
-  pname = "ruamel.yaml";
+  pname = "ruamel-yaml";
  version = "0.17.16";

  src = fetchPypi {
-    inherit pname version;
+    pname = "ruamel.yaml";
+    inherit version;
    sha256 = "1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33";
  };

@ -21,10 +22,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [ ruamel-base ]
    ++ lib.optional (!isPyPy) ruamel_yaml_clib;

-  pythonImportsCheck = [
-    "ruamel.yaml"
-    "ruamel.base"
-  ];
+  pythonImportsCheck = [ "ruamel.yaml" ];

  meta = with lib; {
    description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@ -6,7 +6,7 @@
 , mistune
 , rdflib
 , rdflib-jsonld
-, ruamel_yaml
+, ruamel-yaml
 , pytestCheckHook
 }:

@ -25,7 +25,7 @@ buildPythonPackage rec {
    mistune
    rdflib
    rdflib-jsonld
-    ruamel_yaml
+    ruamel-yaml
  ];

  checkInputs = [ pytestCheckHook ];
--- a/pkgs/development/python-modules/strictyaml/default.nix
+++ b/pkgs/development/python-modules/strictyaml/default.nix
@ -2,7 +2,7 @@
 , lib
 , fetchPypi
 , isPy27
-, ruamel_yaml
+, ruamel-yaml
 , python-dateutil
 }:

@ -21,7 +21,7 @@ buildPythonPackage rec {
      --replace "ruamel.yaml==0.17.4" "ruamel.yaml"
  '';

-  propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
+  propagatedBuildInputs = [ ruamel-yaml python-dateutil ];

  # Library tested with external tool
  # https://hitchdev.com/approach/contributing-to-hitch-libraries/
--- a/pkgs/development/python-modules/yamale/default.nix
+++ b/pkgs/development/python-modules/yamale/default.nix
@ -4,7 +4,7 @@
 , pythonOlder
 , pytestCheckHook
 , pyyaml
-, ruamel_yaml
+, ruamel-yaml
 }:

 buildPythonPackage rec {
@ -22,7 +22,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    pyyaml
-    ruamel_yaml
+    ruamel-yaml
  ];

  checkInputs = [
--- a/pkgs/development/tools/dt-schema/default.nix
+++ b/pkgs/development/tools/dt-schema/default.nix
@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , git
-, ruamel_yaml
+, ruamel-yaml
 , jsonschema
 , rfc3987
 , setuptools
@ -21,7 +21,7 @@ buildPythonPackage rec {
  nativeBuildInputs = [ setuptools-scm git ];
  propagatedBuildInputs = [
    setuptools
-    ruamel_yaml
+    ruamel-yaml
    jsonschema
    rfc3987
  ];
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/development/tools/fdroidserver/default.nix
@ -44,7 +44,7 @@ python.pkgs.buildPythonApplication rec {
    pyyaml
    qrcode
    requests
-    ruamel_yaml
+    ruamel-yaml
    yamllint
  ];

--- a/pkgs/development/tools/misc/replacement/default.nix
+++ b/pkgs/development/tools/misc/replacement/default.nix
@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
  };

  propagatedBuildInputs = with python3Packages; [
-    ruamel_yaml
+    ruamel-yaml
  ];

  checkInputs = with python3Packages; [
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -80,6 +80,7 @@ mapAliases ({
  requests_toolbelt = requests-toolbelt; # added 2017-09-26
  rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
  ruamel_base = ruamel-base; # added 2021-11-01
+  ruamel_yaml = ruamel-yaml; # added 2021-11-01
  scikitlearn = scikit-learn; # added 2021-07-21
  selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
  setuptools_scm = setuptools-scm; # added 2021-06-03
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -8204,8 +8204,7 @@ in {

  ruamel-base = callPackage ../development/python-modules/ruamel-base { };

-  ruamel-yaml = self.ruamel_yaml;
-  ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { };
+  ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { };

  ruamel-yaml-clib = self.ruamel_yaml_clib;
  ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { };
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@ -530,8 +530,7 @@ with self; with super; {

  ruamel-ordereddict = callPackage ../development/python-modules/ruamel-ordereddict { };

-  ruamel_yaml = self.ruamel-yaml;
-  ruamel-yaml = callPackage ../development/python-modules/ruamel_yaml/0.16.nix { };
+  ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml/0.16.nix { };

  runsnakerun = callPackage ../development/python-modules/runsnakerun { };