Merge pull request #653 from HEXRD/fix-arm64

Add back in arm64 builds
HEXRD · Jun 25, 2024 · d57ef03 · d57ef03
2 parents 386b02d + f8bff7a
commit d57ef03
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/conda.recipe/conda_build_config.yaml b/conda.recipe/conda_build_config.yaml
@@ -15,5 +15,5 @@ cxx_compiler_version:      # [osx]
 target_platform:
   - linux-64               # [linux]
   - osx-64                 # [osx]
-  # - osx-arm64              # [osx]
+  - osx-arm64              # [osx]
   - win-64                 # [win]
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -17,13 +17,13 @@ requirements:
     - {{ compiler('cxx') }}
     - python {{ python }}                    # [build_platform != target_platform]
     - cross-python_{{ target_platform }}     # [build_platform != target_platform]
-    - numpy >=1.20                           # [build_platform != target_platform]
+    - numpy >=1.20,<2.0                      # [build_platform != target_platform]
     # Numba is only here to make sure we use a version of numpy that is compatible
     - numba                                  # [build_platform != target_platform]
     - pybind11                               # [build_platform != target_platform]
   host:
     - python {{ python }}
-    - numpy >=1.20
+    - numpy >=1.20,<2.0
     - setuptools
     - setuptools_scm
     # Numba is only here to make sure we use a version of numpy that is compatible

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "wheel", "numpy<1.27", "setuptools_scm[toml]", "pybind11>=2.11.0"]
+requires = ["setuptools", "wheel", "numpy<2.0", "setuptools_scm[toml]", "pybind11>=2.11.0"]
 
 [tool.black]
 line-length = 79