From eea616c4d7e14846c5d8000612e57c651aea3d6f48827cafd82e12b4b6143faf Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 30 Sep 2023 13:02:20 +0000 Subject: [PATCH] Accepting request 1114462 from home:mimi_vx:branches:devel:languages:python - refresh remove-icecream-dep.patch - update to 3.3.1 detailed changelog: https://www.paramiko.org/changelog.html# OBS-URL: https://build.opensuse.org/request/show/1114462 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-paramiko?expand=0&rev=114 --- paramiko-3.1.0.tar.gz | 3 --- paramiko-3.3.1.tar.gz | 3 +++ python-paramiko.changes | 7 +++++++ python-paramiko.spec | 18 +++++------------- remove-icecream-dep.patch | 22 ++++++++++++++++------ 5 files changed, 31 insertions(+), 22 deletions(-) delete mode 100644 paramiko-3.1.0.tar.gz create mode 100644 paramiko-3.3.1.tar.gz diff --git a/paramiko-3.1.0.tar.gz b/paramiko-3.1.0.tar.gz deleted file mode 100644 index 52ee4bb..0000000 --- a/paramiko-3.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6950faca6819acd3219d4ae694a23c7a87ee38d084f70c1724b0c0dbb8b75769 -size 1189515 diff --git a/paramiko-3.3.1.tar.gz b/paramiko-3.3.1.tar.gz new file mode 100644 index 0000000..17405ba --- /dev/null +++ b/paramiko-3.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a3777a961ac86dbef375c5f5b8d50014a1a96d0fd7f054a43bc880134b0ff77 +size 1270242 diff --git a/python-paramiko.changes b/python-paramiko.changes index a4f6380..12451d2 100644 --- a/python-paramiko.changes +++ b/python-paramiko.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 29 22:29:46 UTC 2023 - Ondřej Súkup + +- refresh remove-icecream-dep.patch +- update to 3.3.1 + detailed changelog: https://www.paramiko.org/changelog.html# + ------------------------------------------------------------------- Fri May 12 09:27:30 UTC 2023 - Daniel Garcia diff --git a/python-paramiko.spec b/python-paramiko.spec index 8141cd9..745eb82 100644 --- a/python-paramiko.spec +++ b/python-paramiko.spec @@ -16,10 +16,9 @@ # -%define skip_python2 1 %{?sle15_python_module_pythons} Name: python-paramiko -Version: 3.1.0 +Version: 3.3.1 Release: 0 Summary: SSH2 protocol library License: LGPL-2.1-or-later @@ -27,20 +26,17 @@ Group: Documentation/Other URL: https://www.paramiko.org/ Source0: https://files.pythonhosted.org/packages/source/p/paramiko/paramiko-%{version}.tar.gz Patch0: paramiko-test_extend_timeout.patch -# PATCH-FIX-OPENSUSE remove-icecream-dep.patch to do not depend on python-icecream +# PATCH-FIX-OPENSUSE remove-icecream-dep.patch to do not depend on python-icecream and unvendor lexicon Patch1: remove-icecream-dep.patch BuildRequires: %{python_module PyNaCl >= 1.0.1} -%if 0%{?suse_version} > 1500 -BuildRequires: python3-Sphinx -%else BuildRequires: %{python_module Sphinx} -%endif BuildRequires: %{python_module bcrypt >= 3.2} BuildRequires: %{python_module cryptography >= 3.3} BuildRequires: %{python_module gssapi} BuildRequires: %{python_module invocations} BuildRequires: %{python_module invoke >= 2.0} -BuildRequires: %{python_module pyasn1 >= 0.1.7} +BuildRequires: %{python_module lexicon} +BuildRequires: %{python_module pyasn1} BuildRequires: %{python_module pytest-relaxed} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} @@ -49,10 +45,10 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Recommends: python-gssapi Recommends: python-invoke +Recommends: python-pyasn1 >= 0.1.7 Requires: python-PyNaCl >= 1.5 Requires: python-bcrypt >= 3.2 Requires: python-cryptography >= 3.3 -Requires: python-pyasn1 >= 0.1.7 BuildArch: noarch %python_subpackages @@ -62,7 +58,6 @@ Emphasis is on using SSH2 as an alternative to SSL for making secure connections between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. -%if 0%{?suse_version} > 1500 %package -n python-paramiko-doc Summary: Documentation for %{name} Group: Documentation/Other @@ -75,7 +70,6 @@ connections between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. This package contains the documentation. -%endif %prep %autosetup -p1 -n paramiko-%{version} @@ -101,10 +95,8 @@ donttest="k5shell" %{python_sitelib}/paramiko %{python_sitelib}/paramiko-%{version}*-info -%if 0%{?suse_version} > 1500 %files -n python-paramiko-doc %license LICENSE -%endif %doc demos/ %changelog diff --git a/remove-icecream-dep.patch b/remove-icecream-dep.patch index f3ffa0a..c543423 100644 --- a/remove-icecream-dep.patch +++ b/remove-icecream-dep.patch @@ -1,14 +1,24 @@ -Index: paramiko-3.1.0/tests/conftest.py +Index: paramiko-3.3.1/tests/conftest.py =================================================================== ---- paramiko-3.1.0.orig/tests/conftest.py -+++ paramiko-3.1.0/tests/conftest.py -@@ -10,12 +10,6 @@ from .loop import LoopSocket - from .stub_sftp import StubServer, StubSFTPServer - from .util import _support +--- paramiko-3.3.1.orig/tests/conftest.py ++++ paramiko-3.3.1/tests/conftest.py +@@ -4,7 +4,7 @@ import shutil + import threading + from pathlib import Path + +-from invoke.vendor.lexicon import Lexicon ++from lexicon import Lexicon + + import pytest + from paramiko import ( +@@ -22,13 +22,6 @@ from ._loop import LoopSocket + from ._stub_sftp import StubServer, StubSFTPServer + from ._util import _support -from icecream import ic, install as install_ic - - +-# Better print() for debugging - use ic()! -install_ic() -ic.configureOutput(includeContext=True) -