diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-08 20:51:35 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-09 15:23:35 -0500 |
| commit | 1a7424957dbe50c68a49145f95955984c4fa118e (patch) | |
| tree | 2c8a25a8147e9ed45b376ecd8c9fd046b98afe58 | |
| parent | 67cb8e90c4e3ba36859e31b375466cddfc4a5230 (diff) | |
| download | guix-patches-1a7424957dbe50c68a49145f95955984c4fa118e.tar guix-patches-1a7424957dbe50c68a49145f95955984c4fa118e.tar.gz | |
gnu: python-robotframework-sshlibrary: Patch for RobotFramework 5 compatibility.
* gnu/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch: New
file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/python-xyz.scm (python-robotframework-sshlibrary): Apply it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch | 19 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 4 |
3 files changed, 23 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 9bfeede60f..11e16c2a16 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1706,6 +1706,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-pytorch-1.9.0-system-libraries.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ + %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ %D%/packages/patches/python-seaborn-kde-test.patch \ %D%/packages/patches/python-seaborn-2690.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ diff --git a/gnu/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch b/gnu/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch new file mode 100644 index 0000000000..d867d4cabb --- /dev/null +++ b/gnu/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch @@ -0,0 +1,19 @@ +This patches add compatibility for the forthcoming RobotFramework 5. + +Taken from: https://github.com/robotframework/SSHLibrary/pull/403. +diff --git a/src/SSHLibrary/pythonforward.py b/src/SSHLibrary/pythonforward.py +index 8b85997b7..607985cf4 100644 +--- a/src/SSHLibrary/pythonforward.py ++++ b/src/SSHLibrary/pythonforward.py +@@ -1,9 +1,9 @@ + import select + import socket + import threading +-from robot.utils import platform ++from robot.utils import PY2, WINDOWS + from .logger import logger +-if platform.PY2 and platform.WINDOWS: ++if PY2 and WINDOWS: + import win_inet_pton + try: + import SocketServer diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e977620ac6..53db2e2062 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4850,7 +4850,9 @@ trace directly to the terminal to ease debugging.") (file-name (git-file-name name version)) (sha256 (base32 - "1fn72hw7xacjjpl4dd6wynh2x63i9rk8iqhj3v640db21qpcnbkw")))) + "1fn72hw7xacjjpl4dd6wynh2x63i9rk8iqhj3v640db21qpcnbkw")) + (patches (search-patches + "python-robotframework-sshlibrary-rf5-compat.patch")))) (build-system python-build-system) (arguments `(#:phases |