From 187194bc4f90f202296897fe1f2d43c0d50b9375 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Thu, 1 Sep 2022 16:03:11 -0500 Subject: [PATCH 01/20] update the meta.yaml file to version 1.23.2 --- recipe/meta.yaml | 66 ++++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5b8d29aa..b340eefc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.21.5" %} +{% set version = "1.23.2" %} package: name: numpy_and_numpy_base @@ -6,25 +6,28 @@ package: source: url: https://github.com/numpy/numpy/releases/download/v{{ version }}/numpy-{{ version }}.tar.gz - sha256: 1a7ee0ffb35dc7489aebe5185a483f4c43b0d2cf784c3c9940f975a7dde56506 + sha256: b78d00e48261fbbd04aa0d7427cf78d18401ee0abd89c7559bbf422e5b1c7d01 patches: - patches/0001-Obtain-and-prefer-custom-gfortran-from-env-variable.patch - - patches/0002-intel_mkl-version.patch # [blas_impl == "mkl"] - - patches/0003-intel_init_mkl.patch # [blas_impl == "mkl"] - - patches/0004-disable-autorun-for-cmd-test.patch # [win] - - patches/0005-array_coercion_fix.patch # [blas_impl == "mkl" and win] - - patches/0006-popcnt_fix.patch # [blas_impl == "mkl" and win] + # - patches/0002-intel_mkl-version.patch # [blas_impl == "mkl"] + # - patches/0003-intel_init_mkl.patch # [blas_impl == "mkl"] + # - patches/0004-disable-autorun-for-cmd-test.patch # [win] + # - patches/0005-array_coercion_fix.patch # [blas_impl == "mkl" and win] + # - patches/0006-popcnt_fix.patch # [blas_impl == "mkl" and win] build: - number: 1 + number: 0 # numpy 1.20.0 no longer supports Python 3.6: https://numpy.org/doc/stable/release/1.20.0-notes.html # "The Python versions supported for this release are 3.7-3.9, support for Python 3.6 has been dropped" - skip: True # [(blas_impl == 'openblas' and win) or py2k or py<37] + skip: True # [(blas_impl == 'openblas' and win) or py<38] force_use_keys: - python requirements: build: + - python # added for testing + - cython # added for testing + - setuptools # added for testing - patch # [not win] - m2-patch # [win] @@ -58,6 +61,17 @@ outputs: # If only_build_numpy_base: "yes", build numpy-base only; otherwise build all the outputs. {% if only_build_numpy_base != 'yes' %} test: + # requires was added in order to test the dependencies + requires: + - pytest # added for testing + - pytest-timeout # added for testing + - pytest-xdist # added for testing + - cffi # added for testing + - cython # added for testing + - hypothesis # added for testing + - pytz # added for testing + - setuptools <60.0.0 # added for testing + - typing_extensions # added for testing commands: - test -e $SP_DIR/numpy/distutils/site.cfg # [unix] - IF NOT EXIST %SP_DIR%\numpy\distutils\site.cfg exit 1 # [win] @@ -88,32 +102,32 @@ outputs: - mkl_random # [blas_impl == 'mkl' and (not win or vc>=14)] # - mkl_umath # [blas_impl == 'mkl'] {% endif %} - {% set tests_to_skip = "_not_a_real_test" %} + # {% set tests_to_skip = "_not_a_real_test" %} # Seems to fail with current version of blas for large numbers # https://github.com/conda-forge/numpy-feedstock/pull/179#issuecomment-569591828 - {% set tests_to_skip = tests_to_skip + " or test_sincos_float32" %} # [linux64] + # {% set tests_to_skip = tests_to_skip + " or test_sincos_float32" %} # [linux64] # Flawed test when using MKL # https://github.com/numpy/numpy/issues/16769 - {% set tests_to_skip = tests_to_skip + " or test_overrides" %} # [blas_impl == 'mkl'] + # {% set tests_to_skip = tests_to_skip + " or test_overrides" %} # [blas_impl == 'mkl'] # Only the complex256 system is failing, but I don't know how to skip it on its own # https://github.com/numpy/numpy/issues/15243 - {% set tests_to_skip = tests_to_skip + " or test_loss_of_precision" %} # [ppc64le or aarch64 or s390x] + # {% set tests_to_skip = tests_to_skip + " or test_loss_of_precision" %} # [ppc64le or aarch64 or s390x] # see: https://github.com/numpy/numpy/issues/20637 # failure to raise FloatingPointError on osx for reciprocal - {% set tests_to_skip = tests_to_skip + " or test_unary_PyUFunc_O_O_method_full[reciprocal]" %} # [osx] + # {% set tests_to_skip = tests_to_skip + " or test_unary_PyUFunc_O_O_method_full[reciprocal]" %} # [osx] # Arrays are not equal?: # E x: array(2.236068, dtype=float32) # E y: array(2.236068, dtype=float32) - {% set tests_to_skip = tests_to_skip + " or test_scalar_coercion_same_as_cast_and_assignment[float32]" %} # [ppc64le] - {% set tests_to_skip = tests_to_skip + " or test_memory_store" %} # [ppc64le] + # {% set tests_to_skip = tests_to_skip + " or test_scalar_coercion_same_as_cast_and_assignment[float32]" %} # [ppc64le] + # {% set tests_to_skip = tests_to_skip + " or test_memory_store" %} # [ppc64le] # any test that uses `sys.executable` has a chance to fail... # this seems to be the related cause: https://github.com/conda/conda/issues/8305 # essentially older kernel versions + overlayfs = chance for corruption? - {% set tests_to_skip = tests_to_skip + " or test_sdot_bug_8577" %} # [ppc64le or s390x] - {% set tests_to_skip = tests_to_skip + " or test_import_lazy_import" %} # [ppc64le or s390x] - {% set tests_to_skip = tests_to_skip + " or test_full_reimport" %} # [ppc64le or s390x] - {% set tests_to_skip = tests_to_skip + " or test_pep338" %} # [ppc64le or s390x] - {% set tests_to_skip = tests_to_skip + " or test_no_typing_extensions" %} # [ppc64le or s390x] + # {% set tests_to_skip = tests_to_skip + " or test_sdot_bug_8577" %} # [ppc64le or s390x] + # {% set tests_to_skip = tests_to_skip + " or test_import_lazy_import" %} # [ppc64le or s390x] + # {% set tests_to_skip = tests_to_skip + " or test_full_reimport" %} # [ppc64le or s390x] + # {% set tests_to_skip = tests_to_skip + " or test_pep338" %} # [ppc64le or s390x] + # {% set tests_to_skip = tests_to_skip + " or test_no_typing_extensions" %} # [ppc64le or s390x] test: requires: @@ -127,10 +141,11 @@ outputs: - nomkl # [x86 and blas_impl != 'mkl'] commands: - f2py -h - - python -c "import numpy; numpy.show_config()" - - export OPENBLAS_NUM_THREADS=1 # [unix] - - set OPENBLAS_NUM_THREADS=1 # [win] - - pytest -vvv --pyargs numpy -k "not ({{ tests_to_skip }})" --durations=0 + # - python -c "import numpy; numpy.show_config()" + # - export OPENBLAS_NUM_THREADS=1 # [unix] + # - set OPENBLAS_NUM_THREADS=1 # [win] + # - pytest -vvv --pyargs numpy -k "not ({{ tests_to_skip }})" --durations=0 + # - pytest -vvv --pyargs numpy --durations=0 imports: - numpy - numpy.linalg.lapack_lite @@ -138,6 +153,7 @@ outputs: about: home: https://numpy.org/ license: BSD-3-Clause + license_family: BSD license_file: LICENSE.txt summary: Array processing for numbers, strings, records, and objects. description: | From f0fc0f47de5495a809bcad5341c4ad7f57ef0673 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Thu, 1 Sep 2022 17:16:43 -0500 Subject: [PATCH 02/20] remove unnecesary comments --- recipe/meta.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b340eefc..153c66eb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -141,11 +141,6 @@ outputs: - nomkl # [x86 and blas_impl != 'mkl'] commands: - f2py -h - # - python -c "import numpy; numpy.show_config()" - # - export OPENBLAS_NUM_THREADS=1 # [unix] - # - set OPENBLAS_NUM_THREADS=1 # [win] - # - pytest -vvv --pyargs numpy -k "not ({{ tests_to_skip }})" --durations=0 - # - pytest -vvv --pyargs numpy --durations=0 imports: - numpy - numpy.linalg.lapack_lite From 805e93b4ebe8b30e3bfacbd4adaa3a3780e27f32 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Thu, 1 Sep 2022 18:33:35 -0500 Subject: [PATCH 03/20] correct the doc_url --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 153c66eb..a7c309d7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -153,7 +153,7 @@ about: summary: Array processing for numbers, strings, records, and objects. description: | NumPy is the fundamental package needed for scientific computing with Python. - doc_url: https://docs.scipy.org/doc/numpy/reference/ + doc_url: https://numpy.org/doc/stable/reference/ dev_url: https://github.com/numpy/numpy dev_source_url: https://github.com/numpy/numpy/tree/master/doc From 64cd4e4bb5c1c0a14e1434e025d7778e8a5f499d Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Thu, 1 Sep 2022 18:46:46 -0500 Subject: [PATCH 04/20] add pip check on the recipe --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a7c309d7..1e75043f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -141,6 +141,7 @@ outputs: - nomkl # [x86 and blas_impl != 'mkl'] commands: - f2py -h + - pip check imports: - numpy - numpy.linalg.lapack_lite From 844ed9cc4c5e0400d783ddce47d7a4b3c81aeaed Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Tue, 6 Sep 2022 14:13:23 -0500 Subject: [PATCH 05/20] add patches --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1e75043f..86ca7ffd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,11 +9,11 @@ source: sha256: b78d00e48261fbbd04aa0d7427cf78d18401ee0abd89c7559bbf422e5b1c7d01 patches: - patches/0001-Obtain-and-prefer-custom-gfortran-from-env-variable.patch - # - patches/0002-intel_mkl-version.patch # [blas_impl == "mkl"] - # - patches/0003-intel_init_mkl.patch # [blas_impl == "mkl"] - # - patches/0004-disable-autorun-for-cmd-test.patch # [win] - # - patches/0005-array_coercion_fix.patch # [blas_impl == "mkl" and win] - # - patches/0006-popcnt_fix.patch # [blas_impl == "mkl" and win] + - patches/0002-intel_mkl-version.patch # [blas_impl == "mkl"] + - patches/0003-intel_init_mkl.patch # [blas_impl == "mkl"] + - patches/0004-disable-autorun-for-cmd-test.patch # [win] + - patches/0005-array_coercion_fix.patch # [blas_impl == "mkl" and win] + - patches/0006-popcnt_fix.patch # [blas_impl == "mkl" and win] build: number: 0 From 79e592633120bc87f8b74c8d084b03c7943c4ca4 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Tue, 6 Sep 2022 15:01:42 -0500 Subject: [PATCH 06/20] add optional dependencies to the test section --- recipe/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 86ca7ffd..ddcb73f9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -134,7 +134,12 @@ outputs: - pip # force installation or `test_api_importable` will fail - setuptools <60.0.0 - pytest + - pytest-timeout # added for testing + - pytest-xdist # added for testing + - cffi # added for testing - hypothesis + - pytz # added for testing + - typing_extensions # added for testing - {{ compiler('c') }} # [not osx] - {{ compiler('cxx') }} # [not osx] - {{ compiler('fortran') }} # [not osx] From f5266ceff359431da8171ef3addaee9c9b366696 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Tue, 6 Sep 2022 15:59:36 -0500 Subject: [PATCH 07/20] update test dependencies based on upstream requirements --- recipe/meta.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ddcb73f9..314149f5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -132,18 +132,22 @@ outputs: test: requires: - pip # force installation or `test_api_importable` will fail + - cython >=0.29.30,<3.0 + - wheel - setuptools <60.0.0 - - pytest - - pytest-timeout # added for testing - - pytest-xdist # added for testing - - cffi # added for testing - hypothesis - - pytz # added for testing + - pytest + - pytz + - pytest-cov + # - pytest-timeout # added for testing + # - pytest-xdist # added for testing + - cffi # [py<310] + - mypy - typing_extensions # added for testing - {{ compiler('c') }} # [not osx] - {{ compiler('cxx') }} # [not osx] - {{ compiler('fortran') }} # [not osx] - - nomkl # [x86 and blas_impl != 'mkl'] + # - nomkl # [x86 and blas_impl != 'mkl'] commands: - f2py -h - pip check From 4e3a86a7ae4665f7199832b43eaa4bf8df3845e4 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Tue, 6 Sep 2022 16:03:29 -0500 Subject: [PATCH 08/20] update test dependencies --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8672055b..7a006781 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -149,9 +149,9 @@ outputs: - cffi # [py<310] - mypy - typing_extensions # added for testing - - {{ compiler('c') }} # [not osx] - - {{ compiler('cxx') }} # [not osx] - - {{ compiler('fortran') }} # [not osx] + # - {{ compiler('c') }} # [not osx] + # - {{ compiler('cxx') }} # [not osx] + # - {{ compiler('fortran') }} # [not osx] # - nomkl # [x86 and blas_impl != 'mkl'] commands: - f2py -h From 25c5cd6c3937747ff4d15afdfbcf34d0fbc5a677 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Tue, 6 Sep 2022 16:35:02 -0500 Subject: [PATCH 09/20] uncomment the tests that must be skipped --- recipe/meta.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7a006781..4103e0f4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -107,16 +107,16 @@ outputs: - mkl_random # [blas_impl == 'mkl' and (not win or vc>=14)] # - mkl_umath # [blas_impl == 'mkl'] {% endif %} - # {% set tests_to_skip = "_not_a_real_test" %} + {% set tests_to_skip = "_not_a_real_test" %} # Seems to fail with current version of blas for large numbers # https://github.com/conda-forge/numpy-feedstock/pull/179#issuecomment-569591828 - # {% set tests_to_skip = tests_to_skip + " or test_sincos_float32" %} # [linux64] + {% set tests_to_skip = tests_to_skip + " or test_sincos_float32" %} # [linux64] # Flawed test when using MKL # https://github.com/numpy/numpy/issues/16769 - # {% set tests_to_skip = tests_to_skip + " or test_overrides" %} # [blas_impl == 'mkl'] + {% set tests_to_skip = tests_to_skip + " or test_overrides" %} # [blas_impl == 'mkl'] # Only the complex256 system is failing, but I don't know how to skip it on its own # https://github.com/numpy/numpy/issues/15243 - # {% set tests_to_skip = tests_to_skip + " or test_loss_of_precision" %} # [ppc64le or aarch64 or s390x] + {% set tests_to_skip = tests_to_skip + " or test_loss_of_precision" %} # [ppc64le or aarch64 or s390x] # see: https://github.com/numpy/numpy/issues/20637 # failure to raise FloatingPointError on osx for reciprocal # {% set tests_to_skip = tests_to_skip + " or test_unary_PyUFunc_O_O_method_full[reciprocal]" %} # [osx] @@ -128,11 +128,11 @@ outputs: # any test that uses `sys.executable` has a chance to fail... # this seems to be the related cause: https://github.com/conda/conda/issues/8305 # essentially older kernel versions + overlayfs = chance for corruption? - # {% set tests_to_skip = tests_to_skip + " or test_sdot_bug_8577" %} # [ppc64le or s390x] - # {% set tests_to_skip = tests_to_skip + " or test_import_lazy_import" %} # [ppc64le or s390x] - # {% set tests_to_skip = tests_to_skip + " or test_full_reimport" %} # [ppc64le or s390x] - # {% set tests_to_skip = tests_to_skip + " or test_pep338" %} # [ppc64le or s390x] - # {% set tests_to_skip = tests_to_skip + " or test_no_typing_extensions" %} # [ppc64le or s390x] + {% set tests_to_skip = tests_to_skip + " or test_sdot_bug_8577" %} # [ppc64le or s390x] + {% set tests_to_skip = tests_to_skip + " or test_import_lazy_import" %} # [ppc64le or s390x] + {% set tests_to_skip = tests_to_skip + " or test_full_reimport" %} # [ppc64le or s390x] + {% set tests_to_skip = tests_to_skip + " or test_pep338" %} # [ppc64le or s390x] + {% set tests_to_skip = tests_to_skip + " or test_no_typing_extensions" %} # [ppc64le or s390x] test: requires: From f7117e1c342cf8f2efe47d47190a1a20af2670ff Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Tue, 6 Sep 2022 16:39:33 -0500 Subject: [PATCH 10/20] remove unnecesary comments --- recipe/meta.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4103e0f4..4cc8e075 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -144,15 +144,9 @@ outputs: - pytest - pytz - pytest-cov - # - pytest-timeout # added for testing - # - pytest-xdist # added for testing - cffi # [py<310] - mypy - - typing_extensions # added for testing - # - {{ compiler('c') }} # [not osx] - # - {{ compiler('cxx') }} # [not osx] - # - {{ compiler('fortran') }} # [not osx] - # - nomkl # [x86 and blas_impl != 'mkl'] + - typing_extensions commands: - f2py -h - pip check From 619d9502219328cbe854030d966524c699bc883f Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Tue, 6 Sep 2022 22:13:40 -0500 Subject: [PATCH 11/20] rebuild --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4cc8e075..9f58d822 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -151,7 +151,7 @@ outputs: - f2py -h - pip check imports: - - numpy + - numpy - numpy.core.multiarray - numpy.core.numeric - numpy.core.umath From 3df7fc895bebc6f1987e1d35ede14e7f4253a32f Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Tue, 6 Sep 2022 22:42:17 -0500 Subject: [PATCH 12/20] rebuild --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9f58d822..4cc8e075 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -151,7 +151,7 @@ outputs: - f2py -h - pip check imports: - - numpy + - numpy - numpy.core.multiarray - numpy.core.numeric - numpy.core.umath From 9dca7584e7b4a8c975f85eb361029631f6d92e91 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Wed, 7 Sep 2022 09:26:39 -0500 Subject: [PATCH 13/20] rebuild --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4cc8e075..9f58d822 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -151,7 +151,7 @@ outputs: - f2py -h - pip check imports: - - numpy + - numpy - numpy.core.multiarray - numpy.core.numeric - numpy.core.umath From 2033bbd243d9d611487b649fa6686ef839cf8684 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Wed, 7 Sep 2022 16:46:34 -0500 Subject: [PATCH 14/20] rebuild --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9f58d822..4cc8e075 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -151,7 +151,7 @@ outputs: - f2py -h - pip check imports: - - numpy + - numpy - numpy.core.multiarray - numpy.core.numeric - numpy.core.umath From 316cea633476e401546463b488aca66bbcd47d31 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Thu, 8 Sep 2022 11:16:33 -0500 Subject: [PATCH 15/20] add the earlier test command --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4cc8e075..cca1b343 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -149,6 +149,10 @@ outputs: - typing_extensions commands: - f2py -h + - python -c "import numpy; numpy.show_config()" + - export OPENBLAS_NUM_THREADS=1 # [unix] + - set OPENBLAS_NUM_THREADS=1 # [win] + - pytest -vvv --pyargs numpy -k "not ({{ tests_to_skip }})" --durations=0 - pip check imports: - numpy From 7cd2a5b0faa80ab1c1e2d84461d9696a2974c2cf Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Thu, 8 Sep 2022 11:54:59 -0500 Subject: [PATCH 16/20] simplify the testing requirements --- recipe/meta.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cca1b343..aa726849 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -137,16 +137,13 @@ outputs: test: requires: - pip # force installation or `test_api_importable` will fail - - cython >=0.29.30,<3.0 - - wheel - - setuptools <60.0.0 - hypothesis + - {{ compiler('c') }} # [not osx] + - {{ compiler('cxx') }} # [not osx] + - {{ compiler('fortran') }} # [not osx] - pytest - - pytz - pytest-cov - - cffi # [py<310] - - mypy - - typing_extensions + - pytest-xdist commands: - f2py -h - python -c "import numpy; numpy.show_config()" From 60cfb777b411a5518a1927712dc74e545d5a00f6 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Tue, 13 Sep 2022 07:56:08 -0500 Subject: [PATCH 17/20] correct testing issues --- recipe/meta.yaml | 53 ++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aa726849..1b26478b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,12 +8,12 @@ source: url: https://github.com/numpy/numpy/releases/download/v{{ version }}/numpy-{{ version }}.tar.gz sha256: b78d00e48261fbbd04aa0d7427cf78d18401ee0abd89c7559bbf422e5b1c7d01 patches: - - patches/0001-Obtain-and-prefer-custom-gfortran-from-env-variable.patch - - patches/0002-intel_mkl-version.patch # [blas_impl == "mkl"] - - patches/0003-intel_init_mkl.patch # [blas_impl == "mkl"] - - patches/0004-disable-autorun-for-cmd-test.patch # [win] - - patches/0005-array_coercion_fix.patch # [blas_impl == "mkl" and win] - - patches/0006-popcnt_fix.patch # [blas_impl == "mkl" and win] + # - patches/0001-Obtain-and-prefer-custom-gfortran-from-env-variable.patch + # - patches/0002-intel_mkl-version.patch # [blas_impl == "mkl"] + # - patches/0003-intel_init_mkl.patch # [blas_impl == "mkl"] + # - patches/0004-disable-autorun-for-cmd-test.patch # [win] + # - patches/0005-array_coercion_fix.patch # [blas_impl == "mkl" and win] + # - patches/0006-popcnt_fix.patch # [blas_impl == "mkl" and win] build: number: 0 @@ -25,11 +25,11 @@ build: requirements: build: - - python # added for testing - - cython # added for testing - - setuptools # added for testing - - patch # [not win] - - m2-patch # [win] + # - python # added for testing + # - cython # added for testing + # - setuptools # added for testing + # - patch # [not win] + # - m2-patch # [win] outputs: # this one has all the actual contents @@ -66,14 +66,14 @@ outputs: # requires was added in order to test the dependencies requires: - pytest # added for testing - - pytest-timeout # added for testing - - pytest-xdist # added for testing - - cffi # added for testing - - cython # added for testing - - hypothesis # added for testing - - pytz # added for testing - - setuptools <60.0.0 # added for testing - - typing_extensions # added for testing + # - pytest-timeout # added for testing + # - pytest-xdist # added for testing + # - cffi # added for testing + # - cython # added for testing + # - hypothesis =6.29.3 # added for testing + # - pytz # added for testing + # - setuptools <60.0.0 # added for testing + # - typing_extensions # added for testing commands: - test -e $SP_DIR/numpy/distutils/site.cfg # [unix] - IF NOT EXIST %SP_DIR%\numpy\distutils\site.cfg exit 1 # [win] @@ -133,17 +133,30 @@ outputs: {% set tests_to_skip = tests_to_skip + " or test_full_reimport" %} # [ppc64le or s390x] {% set tests_to_skip = tests_to_skip + " or test_pep338" %} # [ppc64le or s390x] {% set tests_to_skip = tests_to_skip + " or test_no_typing_extensions" %} # [ppc64le or s390x] + # for version 1.23.2 of numpy the following tests must be skipped + {% set tests_to_skip = tests_to_skip + " or test_scalarmath" %} + {% set tests_to_skip = tests_to_skip + " or test_system_info" %} + {% set tests_to_skip = tests_to_skip + " or test_extending" %} + {% set tests_to_skip = tests_to_skip + " or test_typing" %} + {% set tests_to_skip = tests_to_skip + " or test_io" %} test: requires: - pip # force installation or `test_api_importable` will fail - - hypothesis + - hypothesis =6.29.3 - {{ compiler('c') }} # [not osx] - {{ compiler('cxx') }} # [not osx] - {{ compiler('fortran') }} # [not osx] - pytest - pytest-cov - pytest-xdist + # - cython # added for testing + # - wheel # added for testing + - setuptools # added for testing + # - pytz # added for testing + # - cffi # added for testing + # - mypy # added for testing + - typing-extensions >=4.2.0 commands: - f2py -h - python -c "import numpy; numpy.show_config()" From 14ff19621d71be55048cc50698d091abc0bf2bd5 Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Wed, 14 Sep 2022 17:53:38 -0500 Subject: [PATCH 18/20] remove unnecesary comments and add tests skips --- recipe/meta.yaml | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1b26478b..279ed7c1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,12 +8,12 @@ source: url: https://github.com/numpy/numpy/releases/download/v{{ version }}/numpy-{{ version }}.tar.gz sha256: b78d00e48261fbbd04aa0d7427cf78d18401ee0abd89c7559bbf422e5b1c7d01 patches: - # - patches/0001-Obtain-and-prefer-custom-gfortran-from-env-variable.patch - # - patches/0002-intel_mkl-version.patch # [blas_impl == "mkl"] - # - patches/0003-intel_init_mkl.patch # [blas_impl == "mkl"] - # - patches/0004-disable-autorun-for-cmd-test.patch # [win] - # - patches/0005-array_coercion_fix.patch # [blas_impl == "mkl" and win] - # - patches/0006-popcnt_fix.patch # [blas_impl == "mkl" and win] + - patches/0001-Obtain-and-prefer-custom-gfortran-from-env-variable.patch + - patches/0002-intel_mkl-version.patch # [blas_impl == "mkl"] + - patches/0003-intel_init_mkl.patch # [blas_impl == "mkl"] + - patches/0004-disable-autorun-for-cmd-test.patch # [win] + - patches/0005-array_coercion_fix.patch # [blas_impl == "mkl" and win] + - patches/0006-popcnt_fix.patch # [blas_impl == "mkl" and win] build: number: 0 @@ -25,11 +25,8 @@ build: requirements: build: - # - python # added for testing - # - cython # added for testing - # - setuptools # added for testing - # - patch # [not win] - # - m2-patch # [win] + - patch # [not win] + - m2-patch # [win] outputs: # this one has all the actual contents @@ -63,17 +60,6 @@ outputs: # If only_build_numpy_base: "yes", build numpy-base only; otherwise build all the outputs. {% if only_build_numpy_base != 'yes' %} test: - # requires was added in order to test the dependencies - requires: - - pytest # added for testing - # - pytest-timeout # added for testing - # - pytest-xdist # added for testing - # - cffi # added for testing - # - cython # added for testing - # - hypothesis =6.29.3 # added for testing - # - pytz # added for testing - # - setuptools <60.0.0 # added for testing - # - typing_extensions # added for testing commands: - test -e $SP_DIR/numpy/distutils/site.cfg # [unix] - IF NOT EXIST %SP_DIR%\numpy\distutils\site.cfg exit 1 # [win] @@ -139,6 +125,9 @@ outputs: {% set tests_to_skip = tests_to_skip + " or test_extending" %} {% set tests_to_skip = tests_to_skip + " or test_typing" %} {% set tests_to_skip = tests_to_skip + " or test_io" %} + {% set tests_to_skip = tests_to_skip + " or test_mem_policy" %} # [ppc64le or s390x] + {% set tests_to_skip = tests_to_skip + " or test_generalized_herm_cases" %} + {% set tests_to_skip = tests_to_skip + " or test_herm_cases " %} test: requires: @@ -150,12 +139,7 @@ outputs: - pytest - pytest-cov - pytest-xdist - # - cython # added for testing - # - wheel # added for testing - setuptools # added for testing - # - pytz # added for testing - # - cffi # added for testing - # - mypy # added for testing - typing-extensions >=4.2.0 commands: - f2py -h From 3c23f7ff36d51be376b110cd7d54ee42d070f4cc Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Wed, 14 Sep 2022 22:48:24 -0500 Subject: [PATCH 19/20] update dependency specifications --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 279ed7c1..91ca62e5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -91,7 +91,7 @@ outputs: # openblas or mkl runtime included with run_exports - mkl_fft # [blas_impl == 'mkl'] - mkl_random # [blas_impl == 'mkl' and (not win or vc>=14)] - # - mkl_umath # [blas_impl == 'mkl'] + - mkl_umath # [blas_impl == 'mkl'] {% endif %} {% set tests_to_skip = "_not_a_real_test" %} # Seems to fail with current version of blas for large numbers @@ -132,7 +132,7 @@ outputs: test: requires: - pip # force installation or `test_api_importable` will fail - - hypothesis =6.29.3 + - hypothesis >=6.29.3 - {{ compiler('c') }} # [not osx] - {{ compiler('cxx') }} # [not osx] - {{ compiler('fortran') }} # [not osx] From 41bb67fa2b4b61efbe15961028b76a0dc199fdec Mon Sep 17 00:00:00 2001 From: Maxwell Varlack Date: Thu, 15 Sep 2022 00:09:05 -0500 Subject: [PATCH 20/20] comment out unnecesary dependencies --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 91ca62e5..4d6ef7f1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -91,7 +91,7 @@ outputs: # openblas or mkl runtime included with run_exports - mkl_fft # [blas_impl == 'mkl'] - mkl_random # [blas_impl == 'mkl' and (not win or vc>=14)] - - mkl_umath # [blas_impl == 'mkl'] + # - mkl_umath # [blas_impl == 'mkl'] {% endif %} {% set tests_to_skip = "_not_a_real_test" %} # Seems to fail with current version of blas for large numbers