Merge branch 'rightlib' into merge-libs-250503-0050

7 files changed, 89 insertions, 18 deletions

diff --git a/contrib/python/Automat/py3/.dist-info/METADATA b/contrib/python/Automat/py3/.dist-info/METADATA
index b86e9ab8e6c..604a4686a2d 100644
--- a/contrib/python/Automat/py3/.dist-info/METADATA
+++ b/contrib/python/Automat/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Automat
-Version: 24.8.1
+Version: 25.4.16
 Summary: Self-service finite-state machines for the programmer on the go.
 Author-email: Glyph <code@glyph.im>
 License: Copyright (c) 2014
@@ -33,18 +33,20 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Typing :: Typed
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing-extensions; python_version < "3.10"
+Requires-Dist: typing_extensions; python_version < "3.10"
 Provides-Extra: visualize
 Requires-Dist: graphviz>0.5.1; extra == "visualize"
 Requires-Dist: Twisted>=16.1.1; extra == "visualize"
+Dynamic: license-file
 
 # Automat #
 
diff --git a/contrib/python/Automat/py3/automat/_methodical.py b/contrib/python/Automat/py3/automat/_methodical.py
index 6c46c11e89e..e2ae8b3d159 100644
--- a/contrib/python/Automat/py3/automat/_methodical.py
+++ b/contrib/python/Automat/py3/automat/_methodical.py
@@ -60,6 +60,10 @@ def _getArgNames(spec):
 
     The name of * and ** arguments is normalized to "*args" and "**kwargs".
 
+    Return type annotations are omitted, since we don't constrain input methods
+    to have the same return type as output methods, nor output methods to have
+    the same output type.
+
     :param ArgSpec spec: A function to interrogate for a signature.
     :return: The set of all argument names in `func`s signature.
     :rtype: Set[str]
@@ -69,7 +73,7 @@ def _getArgNames(spec):
         + spec.kwonlyargs
         + (("*args",) if spec.varargs else ())
         + (("**kwargs",) if spec.varkw else ())
-        + spec.annotations
+        + tuple(a for a in spec.annotations if a[0] != "return")
     )
 
 
diff --git a/contrib/python/Automat/py3/ya.make b/contrib/python/Automat/py3/ya.make
index 89ecf811932..ed9bb1f9b3b 100644
--- a/contrib/python/Automat/py3/ya.make
+++ b/contrib/python/Automat/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(24.8.1)
+VERSION(25.4.16)
 
 LICENSE(MIT)
 
diff --git a/contrib/python/rsa/py3/.dist-info/METADATA b/contrib/python/rsa/py3/.dist-info/METADATA
index 926968149bf..76959d84154 100644
--- a/contrib/python/rsa/py3/.dist-info/METADATA
+++ b/contrib/python/rsa/py3/.dist-info/METADATA
@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: rsa
-Version: 4.9
+Version: 4.9.1
 Summary: Pure-Python RSA implementation
-Home-page: https://stuvel.eu/rsa
 License: Apache-2.0
 Author: Sybren A. Stüvel
 Author-email: sybren@stuvel.eu
@@ -15,18 +14,53 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Security :: Cryptography
 Requires-Dist: pyasn1 (>=0.1.3)
+Project-URL: Homepage, https://stuvel.eu/rsa
 Project-URL: Repository, https://github.com/sybrenstuvel/python-rsa
 Description-Content-Type: text/markdown
 
+# Python-RSA has been archived
+
+Hi folks,
+
+I'm Sybren, one of the original authors and the maintainer of this project.
+Unfortunately I don't have the time and brain space left to properly maintain
+Python-RSA. As you can see from the lack of activity on the open issues, and the
+lack of commits, that has been the case for a while now.
+
+As Python-RSA is included as a dependency in quite a few high-profile projects,
+I don't feel comfortable handing over the project to someone else. It's just too
+big of a risk.
+
+Thanks for having used this little library for so long, and in so many projects.
+I truely didn't expect that when I started working on it. Also big thanks to all
+the people helping out and improving the project.
+
+There are improvements that haven't made it into a new release. As I said, I
+don't have the time and the brain space to really investigate and oversee the
+security impact of all those changes. It's not a decision I've made lightly.
+
+So that's it. If you want to keep the project alive, please fork it. Give it the
+love it deserves, investigate those yet-unreleased improvements, and have a
+project that's then already better than how I left this one.
+
+Cheers,
+Sybren
+
+
+---------------------------------------------
+
 # Pure Python RSA implementation
 
 [![PyPI](https://img.shields.io/pypi/v/rsa.svg)](https://pypi.org/project/rsa/)
@@ -96,8 +130,8 @@ index-servers =
 pip install twine
 
 poetry build
-twine check dist/rsa-4.9.tar.gz dist/rsa-4.9-*.whl
-twine upload -r rsa dist/rsa-4.9.tar.gz dist/rsa-4.9-*.whl
+twine check dist/rsa-4.9.1.tar.gz dist/rsa-4.9.1-*.whl
+twine upload -r rsa dist/rsa-4.9.1.tar.gz dist/rsa-4.9.1-*.whl
 ```
 
 The `pip install twine` is necessary as Python-RSA requires Python >= 3.6, and
diff --git a/contrib/python/rsa/py3/README.md b/contrib/python/rsa/py3/README.md
index fae569b9ea6..987804e42a8 100644
--- a/contrib/python/rsa/py3/README.md
+++ b/contrib/python/rsa/py3/README.md
@@ -1,3 +1,34 @@
+# Python-RSA has been archived
+
+Hi folks,
+
+I'm Sybren, one of the original authors and the maintainer of this project.
+Unfortunately I don't have the time and brain space left to properly maintain
+Python-RSA. As you can see from the lack of activity on the open issues, and the
+lack of commits, that has been the case for a while now.
+
+As Python-RSA is included as a dependency in quite a few high-profile projects,
+I don't feel comfortable handing over the project to someone else. It's just too
+big of a risk.
+
+Thanks for having used this little library for so long, and in so many projects.
+I truely didn't expect that when I started working on it. Also big thanks to all
+the people helping out and improving the project.
+
+There are improvements that haven't made it into a new release. As I said, I
+don't have the time and the brain space to really investigate and oversee the
+security impact of all those changes. It's not a decision I've made lightly.
+
+So that's it. If you want to keep the project alive, please fork it. Give it the
+love it deserves, investigate those yet-unreleased improvements, and have a
+project that's then already better than how I left this one.
+
+Cheers,
+Sybren
+
+
+---------------------------------------------
+
 # Pure Python RSA implementation
 
 [![PyPI](https://img.shields.io/pypi/v/rsa.svg)](https://pypi.org/project/rsa/)
@@ -67,8 +98,8 @@ index-servers =
 pip install twine
 
 poetry build
-twine check dist/rsa-4.9.tar.gz dist/rsa-4.9-*.whl
-twine upload -r rsa dist/rsa-4.9.tar.gz dist/rsa-4.9-*.whl
+twine check dist/rsa-4.9.1.tar.gz dist/rsa-4.9.1-*.whl
+twine upload -r rsa dist/rsa-4.9.1.tar.gz dist/rsa-4.9.1-*.whl
 ```
 
 The `pip install twine` is necessary as Python-RSA requires Python >= 3.6, and
diff --git a/contrib/python/rsa/py3/rsa/__init__.py b/contrib/python/rsa/py3/rsa/__init__.py
index d0185fe922f..e7689072b29 100644
--- a/contrib/python/rsa/py3/rsa/__init__.py
+++ b/contrib/python/rsa/py3/rsa/__init__.py
@@ -35,8 +35,8 @@ from rsa.pkcs1 import (
 )
 
 __author__ = "Sybren Stuvel, Barry Mead and Yesudeep Mangalapilly"
-__date__ = "2022-07-20"
-__version__ = "4.9"
+__date__ = "2025-04-16"
+__version__ = "4.9.1"
 
 # Do doctest if we're run directly
 if __name__ == "__main__":
diff --git a/contrib/python/rsa/py3/ya.make b/contrib/python/rsa/py3/ya.make
index 3b4e2bfef1d..ab6a193bd02 100644
--- a/contrib/python/rsa/py3/ya.make
+++ b/contrib/python/rsa/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(4.9)
+VERSION(4.9.1)
 
 LICENSE(Apache-2.0)