From 9491227dcbe52fff1b65ebb9b162d825152b7173 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 31 May 2017 21:08:26 +0100 Subject: gnu: python-file: Drop outdated patch. * gnu/local.mk: Remove python-file-double-encoding-bug.patch * gnu/packages/patches/python-file-double-encoding-bug.patch: Delete file. * gnu/packages/python.scm (python-file)[source]: Remove "python-file-double-encoding-bug.patch". Signed-off-by: Danny Milosavljevic --- gnu/packages/python.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b958199bdb..aaa69075ef 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7578,10 +7578,6 @@ Python's @code{ctypes} foreign function interface (FFI).") (package (inherit file) (name "python-file") - (source (origin - (inherit (package-source file)) - ;; This patch should not be applied to python2-file. - (patches (search-patches "python-file-double-encoding-bug.patch")))) (build-system python-build-system) (arguments '(#:tests? #f ;no tests -- cgit v1.3 From e46e9573855d5ee4f71db0ce77159bbc636330c1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Jun 2017 10:24:57 +0300 Subject: gnu: python: Skip one more test. * gnu/packages/python.scm (python)[source]: Remove another test. --- gnu/packages/python.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1373e4bb75..505e4a813b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -340,8 +340,11 @@ data types.") (base32 "1c6v1n9nz4mlx9mw1125fxpmbrgniqdbbx9hnqx44maqazb2mzpf")) (snippet - '(delete-file - "Lib/ctypes/test/test_win32.py")))) ; fails on aarch64 + '(begin + (for-each delete-file + '("Lib/ctypes/test/test_win32.py" ; fails on aarch64 + "Lib/test/test_fcntl.py")) + #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) ((#:tests? _) #t))) (native-search-paths -- cgit v1.3 From 60724d69752b24ab3b6b4501925e62726316d28c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Jun 2017 22:43:39 +0200 Subject: gnu: python-pytest: Build with 'bash' instead of 'bash-final'. Addresses FTBFS after 704243e0c6ec5ac86e2f45aaa469717e60b89124. * gnu/packages/python.scm (python-pytest)[native-inputs]: Add BASH. (python-pytest-3.0)[native-inputs]: Inherit. --- gnu/packages/python.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index cbef0e6812..ef7b92bd48 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1877,7 +1877,9 @@ code introspection, and logging.") (propagated-inputs `(("python-py" ,python-py))) (native-inputs - `(("python-nose" ,python-nose) + `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. + ("bash" ,bash) + ("python-nose" ,python-nose) ("python-mock" ,python-mock))) (home-page "http://pytest.org") (synopsis "Python testing library") @@ -1914,9 +1916,8 @@ and many external plugins.") line))) #t))))) (native-inputs - `(("python-nose" ,python-nose) - ("python-mock" ,python-mock) - ("python-hypothesis" ,python-hypothesis))) + `(("python-hypothesis" ,python-hypothesis) + ,@(package-native-inputs python-pytest))) (properties `((python2-variant . ,(delay python2-pytest-3.0)))))) (define-public python2-pytest-3.0 -- cgit v1.3 From dc4f697f01848019b61ead5e548a4a7aa1a5d97c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 24 Jul 2017 17:24:17 +0200 Subject: gnu: python-pexpect: Add dependency on the full Bash. Fixes a regression introduced in 704243e0c6ec5ac86e2f45aaa469717e60b89124. * gnu/packages/python.scm (python-pexpect)[native-inputs]: Add BASH. --- gnu/packages/python.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e9196b949e..c903de4c36 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5237,7 +5237,8 @@ cluster without needing to write any wrapper code yourself.") `(("python-nose" ,python-nose) ("python-pytest" ,python-pytest-3.0) ("man-db" ,man-db) - ("which" ,which))) + ("which" ,which) + ("bash-full" ,bash))) ;full Bash for 'test_replwrap.py' (propagated-inputs `(("python-ptyprocess" ,python-ptyprocess))) (home-page "http://pexpect.readthedocs.org/") -- cgit v1.3 From 240d3ceff78464a160d099adfb6463f4f17d6616 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 5 Aug 2017 00:12:17 +0200 Subject: gnu: python-argcomplete: Add dependency on the full Bash. Fixes a regression introduced in 704243e0c6ec5ac86e2f45aaa469717e60b89124. * gnu/packages/python.scm (python-argcomplete)[native-inputs]: Add BASH. --- gnu/packages/python.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ee2743b028..f8300a1752 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13500,7 +13500,8 @@ specs from your Flask-Restful projects.") (build-system python-build-system) (native-inputs `(("python-pexpect" ,python-pexpect) - ("tcsh" ,tcsh))) + ("tcsh" ,tcsh) + ("bash-full" ,bash))) ;full Bash for 'test_file_completion' (home-page "https://github.com/kislyuk/argcomplete") (synopsis "Shell tab completion for Python argparse") (description "argcomplete provides extensible command line tab completion -- cgit v1.3