diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-15 13:34:24 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-23 17:26:44 +0200 |
| commit | 790a8a8e187b792a3edb1e34b49b82de4f2fd27e (patch) | |
| tree | 818ee2a6da99fcd7e2c60fc877127b040f5ebf68 /gnu/packages/python.scm | |
| parent | 6520aeae30d4bbe8642cbbe1d33558df65c3a6bb (diff) | |
gnu: Python: Remove trailing #t's.
* gnu/packages/python.scm (python-2.7)[source, arguments]: Remove trailing
#t's.
(wrap-python3)[arguments]: Likewise.
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b5cc258663b..74af5b3445d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm | |||
| @@ -174,8 +174,7 @@ | |||
| 174 | "Lib/test/test_import.py" | 174 | "Lib/test/test_import.py" |
| 175 | "Lib/test/test_shutil.py" | 175 | "Lib/test/test_shutil.py" |
| 176 | "Lib/test/test_socket.py" | 176 | "Lib/test/test_socket.py" |
| 177 | "Lib/test/test_subprocess.py")) | 177 | "Lib/test/test_subprocess.py")))))) |
| 178 | #t)))) | ||
| 179 | (outputs '("out" | 178 | (outputs '("out" |
| 180 | "tk" ;tkinter; adds 50 MiB to the closure | 179 | "tk" ;tkinter; adds 50 MiB to the closure |
| 181 | "idle")) ;programming environment; weighs 5MB | 180 | "idle")) ;programming environment; weighs 5MB |
| @@ -243,15 +242,13 @@ | |||
| 243 | "Lib/distutils/tests/test_spawn.py" | 242 | "Lib/distutils/tests/test_spawn.py" |
| 244 | "Lib/test/support/__init__.py" | 243 | "Lib/test/support/__init__.py" |
| 245 | "Lib/test/test_subprocess.py")) | 244 | "Lib/test/test_subprocess.py")) |
| 246 | (("/bin/sh") (which "sh"))) | 245 | (("/bin/sh") (which "sh"))))) |
| 247 | #t)) | ||
| 248 | ,@(if (hurd-system?) | 246 | ,@(if (hurd-system?) |
| 249 | `((add-before 'build 'patch-regen-for-hurd | 247 | `((add-before 'build 'patch-regen-for-hurd |
| 250 | (lambda* (#:key inputs #:allow-other-keys) | 248 | (lambda* (#:key inputs #:allow-other-keys) |
| 251 | (let ((libc (assoc-ref inputs "libc"))) | 249 | (let ((libc (assoc-ref inputs "libc"))) |
| 252 | (substitute* "Lib/plat-generic/regen" | 250 | (substitute* "Lib/plat-generic/regen" |
| 253 | (("/usr/include/") (string-append libc "/include/"))) | 251 | (("/usr/include/") (string-append libc "/include/"))))))) |
| 254 | #t)))) | ||
| 255 | '()) | 252 | '()) |
| 256 | (add-before 'configure 'do-not-record-configure-flags | 253 | (add-before 'configure 'do-not-record-configure-flags |
| 257 | (lambda* (#:key configure-flags #:allow-other-keys) | 254 | (lambda* (#:key configure-flags #:allow-other-keys) |
| @@ -267,13 +264,11 @@ | |||
| 267 | (format #f "CONFIG_ARGS='~a'\n" | 264 | (format #f "CONFIG_ARGS='~a'\n" |
| 268 | (if (member "--with-system-ffi" configure-flags) | 265 | (if (member "--with-system-ffi" configure-flags) |
| 269 | "--with-system-ffi" | 266 | "--with-system-ffi" |
| 270 | "")))) | 267 | "")))))) |
| 271 | #t)) | ||
| 272 | (add-before 'check 'pre-check | 268 | (add-before 'check 'pre-check |
| 273 | (lambda _ | 269 | (lambda _ |
| 274 | ;; 'Lib/test/test_site.py' needs a valid $HOME | 270 | ;; 'Lib/test/test_site.py' needs a valid $HOME |
| 275 | (setenv "HOME" (getcwd)) | 271 | (setenv "HOME" (getcwd)))) |
| 276 | #t)) | ||
| 277 | (add-after 'unpack 'set-source-file-times-to-1980 | 272 | (add-after 'unpack 'set-source-file-times-to-1980 |
| 278 | ;; XXX One of the tests uses a ZIP library to pack up some of the | 273 | ;; XXX One of the tests uses a ZIP library to pack up some of the |
| 279 | ;; source tree, and fails with "ZIP does not support timestamps | 274 | ;; source tree, and fails with "ZIP does not support timestamps |
| @@ -283,8 +278,7 @@ | |||
| 283 | (let ((circa-1980 (* 10 366 24 60 60))) | 278 | (let ((circa-1980 (* 10 366 24 60 60))) |
| 284 | (ftw "." (lambda (file stat flag) | 279 | (ftw "." (lambda (file stat flag) |
| 285 | (utime file circa-1980 circa-1980) | 280 | (utime file circa-1980 circa-1980) |
| 286 | #t)) | 281 | #t))))) |
| 287 | #t))) | ||
| 288 | (add-after 'install 'remove-tests | 282 | (add-after 'install 'remove-tests |
| 289 | ;; Remove 25 MiB of unneeded unit tests. Keep test_support.* | 283 | ;; Remove 25 MiB of unneeded unit tests. Keep test_support.* |
| 290 | ;; because these files are used by some libraries out there. | 284 | ;; because these files are used by some libraries out there. |
| @@ -339,8 +333,7 @@ | |||
| 339 | ;; Python 2 has a single file extension (.pyo) for the chosen | 333 | ;; Python 2 has a single file extension (.pyo) for the chosen |
| 340 | ;; level of optimization, so it doesn't make sense to byte | 334 | ;; level of optimization, so it doesn't make sense to byte |
| 341 | ;; compile with more than one level. | 335 | ;; compile with more than one level. |
| 342 | (list '() '("-OO"))) | 336 | (list '() '("-OO")))))) |
| 343 | #t))) | ||
| 344 | (add-after 'install 'move-tk-inter | 337 | (add-after 'install 'move-tk-inter |
| 345 | (lambda* (#:key outputs #:allow-other-keys) | 338 | (lambda* (#:key outputs #:allow-other-keys) |
| 346 | ;; When Tkinter support is built move it to a separate output so | 339 | ;; When Tkinter support is built move it to a separate output so |
| @@ -360,8 +353,7 @@ | |||
| 360 | len) | 353 | len) |
| 361 | "/site-packages"))) | 354 | "/site-packages"))) |
| 362 | (install-file tkinter.so target) | 355 | (install-file tkinter.so target) |
| 363 | (delete-file tkinter.so))))) | 356 | (delete-file tkinter.so)))))))) |
| 364 | #t))) | ||
| 365 | (add-after 'install 'move-idle | 357 | (add-after 'install 'move-idle |
| 366 | (lambda* (#:key outputs #:allow-other-keys) | 358 | (lambda* (#:key outputs #:allow-other-keys) |
| 367 | ;; when idle is built, move it to a separate output to save some | 359 | ;; when idle is built, move it to a separate output to save some |
| @@ -460,8 +452,7 @@ data types.") | |||
| 460 | (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) | 452 | (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) |
| 461 | ;; Delete windows binaries | 453 | ;; Delete windows binaries |
| 462 | (for-each delete-file | 454 | (for-each delete-file |
| 463 | (find-files "Lib/distutils/command" "\\.exe$")) | 455 | (find-files "Lib/distutils/command" "\\.exe$")))))) |
| 464 | #t)))) | ||
| 465 | (arguments | 456 | (arguments |
| 466 | (substitute-keyword-arguments (package-arguments python-2) | 457 | (substitute-keyword-arguments (package-arguments python-2) |
| 467 | ((#:make-flags _) | 458 | ((#:make-flags _) |
| @@ -658,8 +649,7 @@ for more information."))) | |||
| 658 | (lambda () | 649 | (lambda () |
| 659 | (format #t "#!~a~%" bash) | 650 | (format #t "#!~a~%" bash) |
| 660 | (format #t "exec \"~a\" \"$@\"~%" old) | 651 | (format #t "exec \"~a\" \"$@\"~%" old) |
| 661 | (chmod new #o755) | 652 | (chmod new #o755)))))))) |
| 662 | #t))))))) | ||
| 663 | (synopsis "Wrapper for the Python 3 commands") | 653 | (synopsis "Wrapper for the Python 3 commands") |
| 664 | (description | 654 | (description |
| 665 | "This package provides wrappers for the commands of Python@tie{}3.x such | 655 | "This package provides wrappers for the commands of Python@tie{}3.x such |
