Intermediate changes

commit_hash:ed08ac10a9a13637599cf60a9a36c630da6ae660

5 files changed, 74 insertions, 30 deletions

diff --git a/contrib/python/ruamel.yaml/py3/.dist-info/METADATA b/contrib/python/ruamel.yaml/py3/.dist-info/METADATA
index 58c54a9405b..1340d3623fa 100644
--- a/contrib/python/ruamel.yaml/py3/.dist-info/METADATA
+++ b/contrib/python/ruamel.yaml/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ruamel.yaml
-Version: 0.19.0
+Version: 0.19.1
 Summary: ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order
 Author: Anthon van der Neut
 Author-email: [email protected]
@@ -28,7 +28,10 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown; charset=UTF-8; variant=CommonMark
 License-File: LICENSE
-Requires-Dist: ruamel.yaml.clibz>=0.3.3; platform_python_implementation == "CPython"
+Provides-Extra: oldlibyaml
+Requires-Dist: ruamel.yaml.clib; platform_python_implementation == "CPython" and extra == "oldlibyaml"
+Provides-Extra: libyaml
+Requires-Dist: ruamel.yaml.clibz>=0.3.7; platform_python_implementation == "CPython" and extra == "libyaml"
 Provides-Extra: jinja2
 Requires-Dist: ruamel.yaml.jinja2>=0.2; extra == "jinja2"
 Provides-Extra: docs
@@ -54,7 +57,7 @@ Dynamic: summary
 | | |
 | - | - |
 | version |0.19.0 |
-| updated |2025-12-31 |
+| updated |2025-01-02 |
 | documentation |https://yaml.dev/doc/ruamel.yaml |
 | repository |https://sourceforge.net/projects/ruamel-yaml |
 | pypi |https://pypi.org/project/ruamel.yaml |
@@ -83,24 +86,40 @@ My experience with other such service downgrades (Bitbucket, Readthedocs), has n
 
 
 
-Starting with 0.19.0 `ruamel.yaml` no longer has `ruamel.yaml.clib` as a dependency,
-as this has been replaced with `ruamel.yaml.clibz`.
-The C sources are functionally unchanged,
-but they are now always compiled (using `setuptools-zig` and `ziglang`) on your system,
-instead of being downloaded as pre-compiled wheels (if available).
-For this to function properly your Python (virtual) environment needs to have
-an up-to-date version of `setuptools` and `wheels` pre-installed.
+Starting with 0.19.1 `ruamel.yaml` no longer has a dependency on `ruamel.yaml.clibz`
+nor on the old `ruamel.yaml.clib`.
+
+Some deployment issues were reported on 0.19.0, due to the lack of proper pinning of the
+`ruamel.yaml` version used. Most of these issues had to do with
+the environment not having updated `setuptools` installed and the build
+dependency `setuptools-zig` for `ruamel.yaml.clibz` not being invoked, with
+Python falling back to invoking gcc (which was even less likely to be installed).
 
-If you run into trouble, you can install `ruamel.yaml.clib` explicitly, without
-using `ruamel.yaml.clibz` at all, using:
+The already indicated simple solution of using:
 
 ```
     python -m pip install --no-deps ruamel.yaml ruamel.yaml.clib
 
 ```
+turned out not to work for at least one setup.
+
+As I am not aware that you can create an install requirement that removes
+a dependency, the default (Cython) dependency is removed and you should
+use `ruamel.yaml[libyaml]` resp. `ruamel.yaml[oldlibyaml]` as your requirements.
+(this is the preferred way over using `ruamel.yaml.clibz` and `ruamel.yaml.clib`
+directly).
+If you are using `ruamel.yaml` in its default (round-trip, `YAML(typ='rt')`) mode,
+there is currently no advantage of installing either optional extension.
+
+
+The C sources are functionally unchanged,
+but they are now always compiled (using `setuptools-zig` and `ziglang`) on your system,
+instead of being downloaded as pre-compiled wheels (if available).
+For this to function properly your Python (virtual) environment needs to have
+an up-to-date version of `setuptools` and `wheels` pre-installed.
 
 The code to load `ruamel.yaml.clib` has priority over `ruamel.yaml.clibz`
-if both are installed (so `--no-deps` is not strictly necessary.
+if both are installed.
 This compatibility will at least be available during the 0.19 `ruamel.yaml` series
 (so pin your usage of `ruamel.yaml` if necessary and report any problems).
 
@@ -187,6 +206,10 @@ For packaging purposes you can use a download of the [tar balls of tagged source
 <a href="http://mypy-lang.org/"><img src="http://www.mypy-lang.org/static/mypy_badge.svg"></a>
 <a href="https://www.pepy.tech/projects/ruamel.yaml"><img src="https://img.shields.io/pepy/dt/ruamel.yaml.svg"></a>
 
+0.19.0 (2025-01-02):
+
+- removed dependency on `ruamel.yaml.clibz`
+
 0.19.0 (2025-12-31):
 
 - changed dependency on `ruamel.yaml.clib` to `ruamel.yaml.clibz` which includes support for free-threading (revisited after a bug report by [Ahmed Moustafa](https://sourceforge.net/u/aemous/profile/) and some insistance by [Nathan Goldbaum](https://sourceforge.net/u/ngoldbaum/profile/)
diff --git a/contrib/python/ruamel.yaml/py3/LICENSE b/contrib/python/ruamel.yaml/py3/LICENSE
index 008000fb833..c781ecbf698 100644
--- a/contrib/python/ruamel.yaml/py3/LICENSE
+++ b/contrib/python/ruamel.yaml/py3/LICENSE
@@ -1,6 +1,6 @@
  The MIT License (MIT)
 
- Copyright (c) 2014-2025 Anthon van der Neut, Ruamel bvba
+ Copyright (c) 2014-2026 Anthon van der Neut, Ruamel bvba
 
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
diff --git a/contrib/python/ruamel.yaml/py3/README.md b/contrib/python/ruamel.yaml/py3/README.md
index c710937ab98..85e26fbd046 100644
--- a/contrib/python/ruamel.yaml/py3/README.md
+++ b/contrib/python/ruamel.yaml/py3/README.md
@@ -5,7 +5,7 @@
 | | |
 | - | - |
 | version |0.19.0 |
-| updated |2025-12-31 |
+| updated |2025-01-02 |
 | documentation |https://yaml.dev/doc/ruamel.yaml |
 | repository |https://sourceforge.net/projects/ruamel-yaml |
 | pypi |https://pypi.org/project/ruamel.yaml |
@@ -34,24 +34,40 @@ My experience with other such service downgrades (Bitbucket, Readthedocs), has n
 
 
 
-Starting with 0.19.0 `ruamel.yaml` no longer has `ruamel.yaml.clib` as a dependency,
-as this has been replaced with `ruamel.yaml.clibz`.
-The C sources are functionally unchanged,
-but they are now always compiled (using `setuptools-zig` and `ziglang`) on your system,
-instead of being downloaded as pre-compiled wheels (if available).
-For this to function properly your Python (virtual) environment needs to have
-an up-to-date version of `setuptools` and `wheels` pre-installed.
+Starting with 0.19.1 `ruamel.yaml` no longer has a dependency on `ruamel.yaml.clibz`
+nor on the old `ruamel.yaml.clib`.
+
+Some deployment issues were reported on 0.19.0, due to the lack of proper pinning of the
+`ruamel.yaml` version used. Most of these issues had to do with
+the environment not having updated `setuptools` installed and the build
+dependency `setuptools-zig` for `ruamel.yaml.clibz` not being invoked, with
+Python falling back to invoking gcc (which was even less likely to be installed).
 
-If you run into trouble, you can install `ruamel.yaml.clib` explicitly, without
-using `ruamel.yaml.clibz` at all, using:
+The already indicated simple solution of using:
 
 ```
     python -m pip install --no-deps ruamel.yaml ruamel.yaml.clib
 
 ```
+turned out not to work for at least one setup.
+
+As I am not aware that you can create an install requirement that removes
+a dependency, the default (Cython) dependency is removed and you should
+use `ruamel.yaml[libyaml]` resp. `ruamel.yaml[oldlibyaml]` as your requirements.
+(this is the preferred way over using `ruamel.yaml.clibz` and `ruamel.yaml.clib`
+directly).
+If you are using `ruamel.yaml` in its default (round-trip, `YAML(typ='rt')`) mode,
+there is currently no advantage of installing either optional extension.
+
+
+The C sources are functionally unchanged,
+but they are now always compiled (using `setuptools-zig` and `ziglang`) on your system,
+instead of being downloaded as pre-compiled wheels (if available).
+For this to function properly your Python (virtual) environment needs to have
+an up-to-date version of `setuptools` and `wheels` pre-installed.
 
 The code to load `ruamel.yaml.clib` has priority over `ruamel.yaml.clibz`
-if both are installed (so `--no-deps` is not strictly necessary.
+if both are installed.
 This compatibility will at least be available during the 0.19 `ruamel.yaml` series
 (so pin your usage of `ruamel.yaml` if necessary and report any problems).
 
@@ -138,6 +154,10 @@ For packaging purposes you can use a download of the [tar balls of tagged source
 <a href="http://mypy-lang.org/"><img src="http://www.mypy-lang.org/static/mypy_badge.svg"></a>
 <a href="https://www.pepy.tech/projects/ruamel.yaml"><img src="https://img.shields.io/pepy/dt/ruamel.yaml.svg"></a>
 
+0.19.0 (2025-01-02):
+
+- removed dependency on `ruamel.yaml.clibz`
+
 0.19.0 (2025-12-31):
 
 - changed dependency on `ruamel.yaml.clib` to `ruamel.yaml.clibz` which includes support for free-threading (revisited after a bug report by [Ahmed Moustafa](https://sourceforge.net/u/aemous/profile/) and some insistance by [Nathan Goldbaum](https://sourceforge.net/u/ngoldbaum/profile/)
diff --git a/contrib/python/ruamel.yaml/py3/ruamel/yaml/__init__.py b/contrib/python/ruamel.yaml/py3/ruamel/yaml/__init__.py
index 3ffd16f2fdd..c548ffd4a22 100644
--- a/contrib/python/ruamel.yaml/py3/ruamel/yaml/__init__.py
+++ b/contrib/python/ruamel.yaml/py3/ruamel/yaml/__init__.py
@@ -6,16 +6,17 @@ if False:  # MYPY
 
 _package_data = dict(
     full_package_name='ruamel.yaml',
-    version_info=(0, 19, 0),
-    __version__='0.19.0',
-    version_timestamp='2025-12-31 17:42:26',
+    version_info=(0, 19, 1),
+    __version__='0.19.1',
+    version_timestamp='2026-01-02 17:17:31',
     author='Anthon van der Neut',
     author_email='[email protected]',
     description='ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order',  # NOQA
     entry_points=None,
     since=2014,
     extras_require={
-        ':platform_python_implementation=="CPython"': ['ruamel.yaml.clibz>=0.3.3'],  # NOQA
+        'oldlibyaml' : ['ruamel.yaml.clib; platform_python_implementation=="CPython"'],  # NOQA
+        'libyaml' : ['ruamel.yaml.clibz>=0.3.7; platform_python_implementation=="CPython"'],  # NOQA
         'jinja2': ['ruamel.yaml.jinja2>=0.2'],
         'docs': ['ryd', 'mercurial>5.7'],
     },
diff --git a/contrib/python/ruamel.yaml/py3/ya.make b/contrib/python/ruamel.yaml/py3/ya.make
index 7710f252d09..793cdc7b5d2 100644
--- a/contrib/python/ruamel.yaml/py3/ya.make
+++ b/contrib/python/ruamel.yaml/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(0.19.0)
+VERSION(0.19.1)
 
 LICENSE(MIT)