Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove overconstraint of numpy dependency #28

Merged
merged 3 commits into from
Jan 10, 2023
Merged

Remove overconstraint of numpy dependency #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e509c7
Remove overconstraint of numpy dependencies
traversaro Dec 16, 2022
8c34da4
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and co…
Dec 16, 2022
f9673e2
Update 233.patch
traversaro Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.21'
- '1.23'
- '1.20'
- '1.20'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -35,5 +30,3 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
7 changes: 0 additions & 7 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
numpy:
- '1.21'
- '1.23'
- '1.20'
- '1.20'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -39,5 +34,3 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
7 changes: 0 additions & 7 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
numpy:
- '1.21'
- '1.23'
- '1.20'
- '1.20'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -35,5 +30,3 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
7 changes: 0 additions & 7 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ cxx_compiler_version:
- '14'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.21'
- '1.23'
- '1.20'
- '1.20'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -35,5 +30,3 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - python
- numpy
8 changes: 0 additions & 8 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
numpy:
- '1.21'
- '1.23'
- '1.20'
- '1.20'
pin_run_as_build:
python:
min_pin: x.x
Expand All @@ -24,6 +19,3 @@ python:
- 3.9.* *_cpython
target_platform:
- win-64
zip_keys:
- - python
- numpy
2 changes: 1 addition & 1 deletion recipe/233.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ index e9ed4a38..bf32f7bc 100644
option(BUILD_TESTING_PYTHON "Build Python tests only." OFF)

if (BUILD_PYTHON_BINDINGS)
+ find_package(Python3 COMPONENTS Interpreter Development NumPy REQUIRED)
+ find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
find_package(pybind11 REQUIRED)
add_subdirectory(python)
endif()
Expand Down
6 changes: 2 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source:
- 248.patch

build:
number: 11
number: 12

outputs:
- name: manif
Expand Down Expand Up @@ -52,7 +52,6 @@ outputs:
- cmake
- python # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
- numpy # [build_platform != target_platform]
- clang 13 # [win]
- lld 13 # [win]
- llvm-tools 13 # [win]
Expand All @@ -61,12 +60,11 @@ outputs:
- tl-optional
- python
- pip
- numpy
- pybind11
- pybind11-abi
run:
- python
- {{ pin_compatible('numpy', max_pin='x.x') }}
- numpy
test:
imports:
- manifpy
Expand Down