summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2022-04-25 14:21:32 -0400
committerJeff Forcier <jeff@bitprophet.org>2022-04-25 14:21:32 -0400
commit29c4d3210b745e7d56c328ffebc2513ebfb482fb (patch)
treed567182b189c292b8a96de6f5c41a2a2e93466da
parent617b5cbe19145e076d2ee02d588a371a80559931 (diff)
parent19490cfa97b26fc93be2ca860ccbd4ac62e463aa (diff)
downloadparamiko-29c4d3210b745e7d56c328ffebc2513ebfb482fb.tar.gz
Merge branch '2.10'
-rw-r--r--paramiko/_version.py2
-rw-r--r--sites/www/changelog.rst2
-rw-r--r--tasks.py1
3 files changed, 3 insertions, 2 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py
index 82bc1161..1d1d0377 100644
--- a/paramiko/_version.py
+++ b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (2, 10, 3)
+__version_info__ = (2, 10, 4)
__version__ = ".".join(map(str, __version_info__))
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 61ff733f..5e8af902 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+- :release:`2.10.4 <2022-04-25>`
+- :release:`2.9.4 <2022-04-25>`
- :support:`1838 backported` (via :issue:`1870`/:issue:`2028`) Update
``camelCase`` method calls against the ``threading`` module to be
``snake_case``; this and related tweaks should fix some deprecation warnings
diff --git a/tasks.py b/tasks.py
index 2e105297..ae408059 100644
--- a/tasks.py
+++ b/tasks.py
@@ -125,7 +125,6 @@ def all_(c, dry_run=False):
release_coll["prepare"](c, dry_run=dry_run)
publish_(c, dry_run=dry_run)
release_coll["push"](c, dry_run=dry_run)
- release_coll["tidelift"](c, dry_run=dry_run)
# TODO: "replace one task with another" needs a better public API, this is