trying to fix numpy pinning (#44)

* trying to fix numpy pinning Signed-off-by: Nick Papior <nickpapior@gmail.com> --------- Signed-off-by: Nick Papior <nickpapior@gmail.com> Co-authored-by: conda-forge-webservices[bot] <91080706+conda-forge-webservices[bot]@users.noreply.github.com>
conda-forge · Oct 16, 2024 · e4eca0f · e4eca0f
1 parent a9aa947
commit e4eca0f
Show file tree

Hide file tree

Showing 18 changed files with 68 additions and 16 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml
@@ -18,6 +18,8 @@ fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '13'
+isl:
+- '0.26'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "sisl" %}
 {% set version = "0.15.1" %}
-{% set sha256 = "e2a0cd939f8be807972e56c9a3ef12bfa6fd19885400f79f1a2b637481cf9330" %}
+{% set sha256 = "d071e352ad3b4dce77464ec08405f2f7ef1c71d440588b075a0c0753b0f2e804" %}
 
 package:
   name: {{ name }}
@@ -12,7 +12,7 @@ source:
   sha256: {{ sha256 }}
 
 build:
-  number: 0
+  number: 1
   skip: true  # [win]
   skip: true  # [py<39]
 
@@ -21,13 +21,14 @@ requirements:
     - cmake
     - make  # [not win]
     - ninja  # [win]
-    - python  # [build_platform != target_platform ]
-    - cross-python_{{ target_platform }}  # [build_platform != target_platform ]
-    - cython >=3  # [build_platform != target_platform ]
-    - numpy >=2.0.0rc1  # [build_platform != target_platform]
     - {{ compiler('fortran') }}
     - {{ compiler('c') }}
     - {{ stdlib("c") }}
+    # The below python packages are necessary for cross-compilation
+    - python  # [build_platform != target_platform ]
+    - cross-python_{{ target_platform }}  # [build_platform != target_platform ]
+    - cython >=3  # [build_platform != target_platform ]
+    - numpy >=2.0.0rc1  # [build_platform != target_platform ]
   host:
     - libblas
     - libcblas
@@ -43,7 +44,7 @@ requirements:
   run:
     - python
     - pyparsing >=2.2.1
-    - {{ pin_compatible('numpy') }}
+    - numpy >=1.21
     - scipy >=1.6
     - tqdm >=4.36
     - xarray >=0.21