* [bug#46919] [PATCHES] Update python-asyncssh and dependencies
@ 2021-03-04 14:09 Lars-Dominik Braun
2021-03-10 11:32 ` bug#46919: Pushed Lars-Dominik Braun
0 siblings, 1 reply; 2+ messages in thread
From: Lars-Dominik Braun @ 2021-03-04 14:09 UTC (permalink / raw)
To: 46919
[-- Attachment #1.1: Type: text/plain, Size: 492 bytes --]
Hi,
attached patches update python-asyncssh and its dependency python-gssapi. I’m
also dropping python-shouldbe, since it has no dependents after applying these
patches and is unmaintained upstream.
Cheers,
Lars
--
Lars-Dominik Braun
Wissenschaftlicher Mitarbeiter/Research Associate
www.leibniz-psychology.org
ZPID - Leibniz-Institut für Psychologie /
ZPID - Leibniz Institute for Psychology
Universitätsring 15
D-54296 Trier - Germany
Tel.: +49–651–201-4964
[-- Attachment #1.2: 0001-gnu-python-gssapi-Update-to-1.6.12.patch --]
[-- Type: text/x-diff, Size: 2596 bytes --]
From f9e6691af3670137fd806c3b234c13004b33eeaf Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <ldb@leibniz-psychology.org>
Date: Thu, 4 Mar 2021 11:57:45 +0100
Subject: [PATCH 1/3] gnu: python-gssapi: Update to 1.6.12.
* gnu/packages/python-xyz.scm (python-gssapi) [version]: Update to 1.6.12.
[arguments]: Tests have been fixed upstream, remove.
[native-inputs]: python-shouldbea is not required any more, remove.
---
gnu/packages/python-xyz.scm | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d9de9bc01c..515d644e9e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -21608,31 +21608,15 @@ tests.")
(define-public python-gssapi
(package
(name "python-gssapi")
- (version "1.6.9")
+ (version "1.6.12")
(source
(origin
(method url-fetch)
(uri (pypi-uri "gssapi" version))
(sha256
(base32
- "1fa78pn5jzfbwf3y6mj4fc8sh11wjf1hwh5qv39cdlxb71qsq2hb"))))
+ "1j2idrbrbczykzlb56q1bn0ivc9c0rjjljpk4yz86xn3gxfkpv8n"))))
(build-system python-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- ;; Work around
- ;; https://github.com/pythongssapi/python-gssapi/issues/220.
- (add-before 'check 'disable-failing-tests
- (lambda _
- (let ((reason "Disabled failing test (see: \
-https://github.com/pythongssapi/python-gssapi/issues/220)."))
- (substitute* "gssapi/tests/test_high_level.py"
- ((".*def test_add_with_impersonate.*" all)
- (string-append all " self.skipTest('" reason "')\n")))
- (substitute* "gssapi/tests/test_raw.py"
- ((".*def test_.*impersonate_name.*" all)
- (string-append all " self.skipTest('" reason "')\n")))
- #t))))))
(propagated-inputs
`(("python-decorator" ,python-decorator)
("python-six" ,python-six)))
@@ -21640,8 +21624,7 @@ https://github.com/pythongssapi/python-gssapi/issues/220)."))
`(("mit-krb5" ,mit-krb5)))
;; for tests
(native-inputs
- `(("python-shouldbe" ,python-shouldbe)
- ("python-parameterized" ,python-parameterized)
+ `(("python-parameterized" ,python-parameterized)
("python-k5test" ,python-k5test)
("python-nose" ,python-nose)))
(home-page "https://github.com/pythongssapi/python-gssapi")
--
2.25.1
[-- Attachment #1.3: 0002-gnu-python-asyncssh-Update-to-2.5.0.patch --]
[-- Type: text/x-diff, Size: 1132 bytes --]
From fbf4e735ae7b4a06f8477f3ad9d90b1ea9d6e716 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <ldb@leibniz-psychology.org>
Date: Thu, 4 Mar 2021 11:59:19 +0100
Subject: [PATCH 2/3] gnu: python-asyncssh: Update to 2.5.0.
* gnu/packages/ssh.scm (python-asyncssh): Update to 2.5.0.
---
gnu/packages/ssh.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index b73e9633ea..68590e2fe5 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -781,14 +781,14 @@ shell services and remote host selection.")
(define-public python-asyncssh
(package
(name "python-asyncssh")
- (version "2.3.0")
+ (version "2.5.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "asyncssh" version))
(sha256
(base32
- "0pi6npmsgx7l9r1qrfvg8mxx3i23ipff492xz4yhrw13f56a7ga4"))))
+ "02xpzir9rmw7b7k07m3f912h6jvy9yzan9yn3ckrmqx2ffpy4r8b"))))
(build-system python-build-system)
(propagated-inputs
`(("python-cryptography" ,python-cryptography)
--
2.25.1
[-- Attachment #1.4: 0003-gnu-python-shouldbe-Remove.patch --]
[-- Type: text/x-diff, Size: 7101 bytes --]
From 8f6ba6b314222244cec40504c7b108de9a2b918e Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <ldb@leibniz-psychology.org>
Date: Thu, 4 Mar 2021 12:00:47 +0100
Subject: [PATCH 3/3] gnu: python-shouldbe: Remove.
Unmaintained upstream and its only dependent (python-gssapi) dropped it.
* gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch: Remove.
* gnu/local.mk: Drop patch file.
* gnu/packages/python-xyz.scm (python-shouldbe): Remove.
---
gnu/local.mk | 1 -
.../python-shouldbe-0.1.2-cpy3.8.patch | 82 -------------------
gnu/packages/python-xyz.scm | 23 ------
3 files changed, 106 deletions(-)
delete mode 100644 gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 3557d9f429..815648d033 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1554,7 +1554,6 @@ dist_patch_DATA = \
%D%/packages/patches/python2-pygobject-2-deprecation.patch \
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/python-robotframework-source-date-epoch.patch \
- %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \
%D%/packages/patches/python-unittest2-python3-compat.patch \
%D%/packages/patches/python-unittest2-remove-argparse.patch \
diff --git a/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch b/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch
deleted file mode 100644
index f3b56e42d6..0000000000
--- a/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Fix compatibility with Python 3.8.
-
-Upstream issue: https://github.com/DirectXMan12/should_be/pull/5
-
-diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/core.py shouldbe-0.1.2.patched/should_be/core.py
---- shouldbe-0.1.2/should_be/core.py 2019-03-06 07:38:22.000000000 +0100
-+++ shouldbe-0.1.2.patched/should_be/core.py 2020-05-18 08:44:24.214664704 +0200
-@@ -103,7 +103,7 @@
- return resf
-
-
--def buildCode(baseCode, argcount=None, kwonlyargcount=None,
-+def buildCode(baseCode, argcount=None, posonlyargcount=None, kwonlyargcount=None,
- nlocals=None, stacksize=None, flags=None,
- code=None, consts=None, names=None,
- varnames=None, filename=None, name=None,
-@@ -121,6 +121,24 @@
- nlocals or baseCode.co_nlocals,
- stacksize or baseCode.co_stacksize,
- flags or baseCode.co_flags,
-+ code or baseCode.co_code,
-+ consts or baseCode.co_consts,
-+ names or baseCode.co_names,
-+ varnames or baseCode.co_varnames,
-+ filename or baseCode.co_filename,
-+ name or baseCode.co_name,
-+ firstlineno or baseCode.co_firstlineno,
-+ lnotab or baseCode.co_lnotab,
-+ freevars or baseCode.co_freevars,
-+ cellvars or baseCode.co_cellvars)
-+ elif hasattr(baseCode, 'co_posonlyargcount'):
-+ # Python 3.8
-+ resc = CodeType(argcount or baseCode.co_argcount,
-+ posonlyargcount or baseCode.co_posonlyargcount,
-+ kwonlyargcount or baseCode.co_kwonlyargcount,
-+ nlocals or baseCode.co_nlocals,
-+ stacksize or baseCode.co_stacksize,
-+ flags or baseCode.co_flags,
- code or baseCode.co_code,
- consts or baseCode.co_consts,
- names or baseCode.co_names,
-diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/tests/test_container_mixin.py shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py
---- shouldbe-0.1.2/should_be/tests/test_container_mixin.py 2019-03-01 06:38:16.000000000 +0100
-+++ shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py 2020-05-18 09:00:51.372531064 +0200
-@@ -7,31 +7,31 @@
- self.lst = [1, 2, 3]
-
- def test_should_include_iter(self):
-- err_msg = (r'[a-zA-Z0-9.]+ should have included \[.+?\]'
-+ err_msg = (r'[a-zA-Z0-9.()]+ should have included \[.+?\]'
- r', but did not have items .+')
-- self.assertRaisesRegexp(AssertionError, err_msg,
-+ self.assertRaisesRegex(AssertionError, err_msg,
- self.lst.should_include, [4])
-
- self.lst.should_include([1, 2, 3])
-
- def test_should_include_item(self):
-- err_msg = (r'[a-zA-Z0-9.]+ should have included .+?'
-+ err_msg = (r'[a-zA-Z0-9.()]+ should have included .+?'
- r', but did not')
-- self.assertRaisesRegexp(AssertionError, err_msg,
-+ self.assertRaisesRegex(AssertionError, err_msg,
- self.lst.should_include, 4)
-
- self.lst.should_include(3)
-
- def test_shouldnt_include_iter(self):
- err_msg = 'should not have included'
-- self.assertRaisesRegexp(AssertionError, err_msg,
-+ self.assertRaisesRegex(AssertionError, err_msg,
- self.lst.shouldnt_include, [2, 3])
-
- self.lst.shouldnt_include([4, 5])
-
- def test_shouldnt_include_item(self):
- err_msg = 'should not have included'
-- self.assertRaisesRegexp(AssertionError, err_msg,
-+ self.assertRaisesRegex(AssertionError, err_msg,
- self.lst.shouldnt_include, 3)
-
- self.lst.shouldnt_include(4)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 515d644e9e..0b981be7c1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -21548,29 +21548,6 @@ and cuts down boilerplate code when testing libraries for asyncio.")
(description "This project allows Python code to extend built-in types.")
(license (list license:gpl3+ license:expat))))
-(define-public python-shouldbe
- (package
- (name "python-shouldbe")
- (version "0.1.2")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "shouldbe" version))
- (sha256
- (base32
- "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj"))
- (patches (search-patches "python-shouldbe-0.1.2-cpy3.8.patch"))))
- (build-system python-build-system)
- (propagated-inputs
- `(("python-forbiddenfruit" ,python-forbiddenfruit)))
- (native-inputs
- `(("python-nose" ,python-nose)))
- (home-page "https://github.com/directxman12/should_be")
- (synopsis "Python Assertion Helpers inspired by Shouldly")
- (description
- "Python Assertion Helpers inspired by Shouldly.")
- (license license:isc)))
-
(define-public python-k5test
(package
(name "python-k5test")
--
2.25.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#46919: Pushed
2021-03-04 14:09 [bug#46919] [PATCHES] Update python-asyncssh and dependencies Lars-Dominik Braun
@ 2021-03-10 11:32 ` Lars-Dominik Braun
0 siblings, 0 replies; 2+ messages in thread
From: Lars-Dominik Braun @ 2021-03-10 11:32 UTC (permalink / raw)
To: 46919-done
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
Pushed as 714465ec7c1d3c40e710e95ec5bd6651311827d6.
--
Lars-Dominik Braun
Wissenschaftlicher Mitarbeiter/Research Associate
www.leibniz-psychology.org
ZPID - Leibniz-Institut für Psychologie /
ZPID - Leibniz Institute for Psychology
Universitätsring 15
D-54296 Trier - Germany
Tel.: +49–651–201-4964
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-10 11:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-04 14:09 [bug#46919] [PATCHES] Update python-asyncssh and dependencies Lars-Dominik Braun
2021-03-10 11:32 ` bug#46919: Pushed Lars-Dominik Braun
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).