[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69295] [PATCH 11/46] gnu: python-astropy: Improve packages style.
From: |
Sharlatan Hellseher |
Subject: |
[bug#69295] [PATCH 11/46] gnu: python-astropy: Improve packages style. |
Date: |
Tue, 20 Feb 2024 23:43:09 +0000 |
* gnu/packages/astronomy.scm (python-astropy): Adjust package style.
[arguments] <#:phases>: {preparations} Simplify it, move step setting up
HOME env to 'prepare-test-environment phase.
{prepare-test-environment}: New phase, consolidating all pre test
procedures.
{check}: Add option to run test in parallel to accelerate them. Remove
from disabled list tests which were passed successfully.
Change-Id: I306ab60b6e155c81035de9584fbd9d06a6381045
---
gnu/packages/astronomy.scm | 86 ++++++++++++++++++++------------------
1 file changed, 46 insertions(+), 40 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 11cdd9e862..9db5b080cc 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1499,46 +1499,52 @@ (define-public python-astropy
(for-each delete-file-recursively '("expat" "wcslib")))))))
(build-system python-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'preparations
- (lambda _
- ;; Use our own libraries in place of bundles.
- (setenv "ASTROPY_USE_SYSTEM_ALL" "1")
- ;; Some tests require a writable home.
- (setenv "HOME" "/tmp")
- ;; Relax xfail tests.
- (substitute* "pyproject.toml"
- (("xfail_strict = true") "xfail_strict = false"))
- ;; Replace reference to external ply.
- (substitute* "astropy/utils/parsing.py"
- (("astropy.extern.ply") "ply"))
- ;; Replace reference to external configobj.
- (with-directory-excursion "astropy/config"
- (substitute* "configuration.py"
- (("from astropy.extern.configobj ") "")))))
- ;; This file is opened in both install and check phases.
- (add-before 'install 'writable-compiler
- (lambda _ (make-file-writable "astropy/_compiler.c")))
- (add-before 'check 'writable-compiler
- (lambda _ (make-file-writable "astropy/_compiler.c")))
- (replace 'check
- (lambda* (#:key inputs outputs tests? #:allow-other-keys)
- (when tests?
- (add-installed-pythonpath inputs outputs)
- ;; Extensions have to be rebuilt before running the tests.
- (invoke "python" "setup.py" "build_ext" "--inplace")
- (invoke "python" "-m" "pytest" "--pyargs" "astropy"
- ;; Skip tests that need remote data.
- "-k" (string-append
- "not remote_data"
- ;; XXX: Check why this tests failing.
- " and not test_ignore_sigint"
- " and not test_parquet_filter"
- ;; See
https://github.com/astropy/astropy/issues/15537
- " and not test_pvstar"
- ;; E ModuleNotFoundError: No module named 'wofz'
- " and not test_pickle_functional"))))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'preparations
+ (lambda _
+ ;; Use our own libraries in place of bundles.
+ (setenv "ASTROPY_USE_SYSTEM_ALL" "1")
+ ;; Relax xfail tests.
+ (substitute* "pyproject.toml"
+ (("xfail_strict = true") "xfail_strict = false"))
+ ;; Replace reference to external ply.
+ (substitute* "astropy/utils/parsing.py"
+ (("astropy.extern.ply") "ply"))
+ ;; Replace reference to external configobj.
+ (substitute* "astropy/config/configuration.py"
+ (("from astropy.extern.configobj ") ""))))
+ ;; This file is opened in both install and check phases.
+ (add-before 'install 'writable-compiler
+ (lambda _
+ (make-file-writable "astropy/_compiler.c")))
+ (add-before 'check 'prepare-test-environment
+ (lambda _
+ ;; Some tests require a writable home.
+ (setenv "HOME" "/tmp")
+ (make-file-writable "astropy/_compiler.c")
+ ;; Extensions have to be rebuilt before running the tests.
+ (invoke "python" "setup.py" "build_ext" "--inplace"
+ "-j" (number->string (parallel-job-count)))))
+ ;; TODO: The swap to pyproject-build-system introduced all tests
+ ;; failed due to pytest could not load conftest.py, find out how
+ ;; to resolve it and migrate completely to pyproject-build-system.
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "python" "-m" "pytest" "--pyargs" "astropy"
+ ;; with -n : 133.00s
+ ;; without -n : 326.14s
+ "-n" (number->string (parallel-job-count))
+ "-k" (string-append
+ ;; Skip tests that need remote data.
+ "not remote_data"
+ ;; E astropy.samp.errors.SAMPProxyError:
+ ;; <SAMPProxyError 1: 'Timeout expired!'>
+ " and not test_main"
+ ;; E ModuleNotFoundError: No module named 'wofz'
+ " and not test_pickle_functional"))))))))
(native-inputs
(list pkg-config
python-colorlog
--
2.41.0
- [bug#69295] [PATCH 28/46] gnu: python-aplpy: Disable tests., (continued)
- [bug#69295] [PATCH 28/46] gnu: python-aplpy: Disable tests., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 26/46] gnu: python-stdatamodels: Update to 1.9.1., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 29/46] gnu: python-asdf: Speed up tests., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 37/46] gnu: python-sunpy: Speed up tests and relax requirements., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 38/46] gnu: python-astroml: Ignore some failing tests., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 34/46] gnu: python-regions: Speed up tests., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 39/46] gnu: python-poliastro: Relax requirements., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 36/46] gnu: python-spectral-cube: Speed up tests., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 40/46] gnu: Add python-extinction., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 44/46] gnu: python-drizzle: Update to 1.15.0., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 11/46] gnu: python-astropy: Improve packages style.,
Sharlatan Hellseher <=
- [bug#69295] [PATCH 45/46] gnu: python-stcal: Update to 1.6.0., Sharlatan Hellseher, 2024/02/20
- [bug#69295] [PATCH 46/46] gnu: python-cdflib: Update to 1.2.4., Sharlatan Hellseher, 2024/02/20
- bug#69295: [PATCH 00/46] gnu: Astronomy 2024/02 updates., Sharlatan Hellseher, 2024/02/27