diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-03-28 13:45:13 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-03-28 13:45:13 +0000 |
| commit | 0e54dc69d768bc863d336ab9795b2917498b12d4 (patch) | |
| tree | 7b2f490021f0b7eb4c25a377b54c476fe4876f1d /dev-python/numpy | |
| parent | 6a80ec454e8e091e94cebca191f52eb2a776e503 (diff) | |
| download | baldeagleos-repo-0e54dc69d768bc863d336ab9795b2917498b12d4.tar.gz baldeagleos-repo-0e54dc69d768bc863d336ab9795b2917498b12d4.tar.xz baldeagleos-repo-0e54dc69d768bc863d336ab9795b2917498b12d4.zip | |
Adding metadata
Diffstat (limited to 'dev-python/numpy')
| -rw-r--r-- | dev-python/numpy/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch | 36 | ||||
| -rw-r--r-- | dev-python/numpy/numpy-1.20.2.ebuild (renamed from dev-python/numpy/numpy-1.20.1.ebuild) | 12 |
3 files changed, 42 insertions, 8 deletions
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index bd68d750b4a6..2be41f6e7d9b 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -1,5 +1,5 @@ DIST numpy-1.19.5.zip 7318340 BLAKE2B a01fd07d8cbfc53c1585b19701f9052fd4b1b4010d24c61e1054352a80343e6644ae6e61ce7565fd9c7c99b9e1174bdd2e685fd5666640d08b1ec9919f86cc8e SHA512 dfe2809b5f486624b4802ea5610822bf7ba80c46dcf8505f69b0267137b01719131f74aa366949954c66796d48ba1b4f74cf0ecc5692a9ebd49e673fb0881ff4 -DIST numpy-1.20.1.zip 7750776 BLAKE2B 0f3915f2e8dfa6e0e7a6251fcba5365379d91b448101513860573f07e1f3fa24b097177a333230d7cbea1f58afed1718346d0348d14344544fe063e4baa6786a SHA512 edd1be2df27940f050ebd8eeb7b053b9987849d3b4aa0cb3c75d2fe2318f358e1b37f3bafedc772c224021e9316ebce45e1b75aa0e35d248f8ba9a9112b57b86 +DIST numpy-1.20.2.zip 7756879 BLAKE2B 8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e SHA512 337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6 diff --git a/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch b/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch new file mode 100644 index 000000000000..2312dd89a9b2 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.20.2-fix-ccompiler-tests.patch @@ -0,0 +1,36 @@ +From 6f2f26e08c6e0d476593c82ad31d13847f30cbf4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sun, 28 Mar 2021 10:00:14 +0200 +Subject: [PATCH] BUG: Fix test_ccompiler_opt when path contains dots + +Fix test_ccompiler_opt not to be confused by dots occurring on the path +to the temporary directory, by using only the source file's basename +when grabbing options. Otherwise, the test can fail with mismatches +such as: + + E AssertionError: 'sources_status' returns different targets than the compiled targets + E ['AVX512F', 'AVX2'] != ['(20 2/TEMP/TMPB0YHSCAI/TEST_TARGETS AVX512F)', '(20 2/TEMP/TMPB0YHSCAI/TEST_TARGETS AVX2)'] + +This is because our TMPDIR value includes numpy version, i.e. 1.20.2. +The splitting happens on the first dot that is part of the directory +path rather than test filename. +--- + numpy/distutils/tests/test_ccompiler_opt.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numpy/distutils/tests/test_ccompiler_opt.py b/numpy/distutils/tests/test_ccompiler_opt.py +index 287a683c8..d2b0a4c58 100644 +--- a/numpy/distutils/tests/test_ccompiler_opt.py ++++ b/numpy/distutils/tests/test_ccompiler_opt.py +@@ -112,7 +112,7 @@ class _Test_CCompilerOpt(object): + gflags = {} + fake_objects = opt.try_dispatch([file]) + for source, flags in fake_objects: +- gtar = source.split('.')[1:-1] ++ gtar = path.basename(source).split('.')[1:-1] + glen = len(gtar) + if glen == 0: + gtar = "baseline" +-- +2.31.1 + diff --git a/dev-python/numpy/numpy-1.20.1.ebuild b/dev-python/numpy/numpy-1.20.2.ebuild index 925356bf98b8..2bc7c7f5a44c 100644 --- a/dev-python/numpy/numpy-1.20.1.ebuild +++ b/dev-python/numpy/numpy-1.20.2.ebuild @@ -46,7 +46,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.20.1-no-hardcode-blasv2.patch + "${FILESDIR}"/numpy-1.20.1-no-hardcode-blasv2.patch + "${FILESDIR}"/numpy-1.20.2-fix-ccompiler-tests.patch ) distutils_enable_tests pytest @@ -118,12 +119,9 @@ python_test() { distutils_install_for_testing --single-version-externally-managed \ --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG} - cd "${TMPDIR}" || die - - "${EPYTHON}" -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}" + cd "${TEST_DIR}/lib" || die + epytest \ + --deselect 'numpy/typing/tests/test_typing.py::test_fail[array_constructors.py]' } python_install() { |