Skip to content

Commit

Permalink
Set ENABLE_SIM=OFF for all builds (#52)
Browse files Browse the repository at this point in the history 
automerged PR by conda-forge/automerge-action
  • Loading branch information
@github-actions
github-actions[bot] committed Oct 4, 2023
2 parents 82fb4e4 + 67d366c commit 1eb1d46
Show file tree
Hide file tree
Showing 38 changed files with 21 additions and 72 deletions.
1 change: 0 additions & 1 deletion .ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
9 changes: 3 additions & 6 deletions .ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos6
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -16,13 +14,13 @@ cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.82'
ncurses:
- '6'
numpy:
- '1.26'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -40,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_aarch64_numpy1.22python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_aarch64_numpy1.22python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_aarch64_numpy1.22python3.9.____73_pypypython_implpypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_aarch64_numpy1.22python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_aarch64_numpy1.23python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
9 changes: 3 additions & 6 deletions .ci_support/linux_aarch64_numpy1.26python3.12.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -11,7 +9,7 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -20,13 +18,13 @@ cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.82'
ncurses:
- '6'
numpy:
- '1.26'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -44,4 +42,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypypython_implpypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
9 changes: 3 additions & 6 deletions .ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos7
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -16,13 +14,13 @@ cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libboost_devel:
- '1.82'
ncurses:
- '6'
numpy:
- '1.26'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -40,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
9 changes: 3 additions & 6 deletions .ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
libboost_devel:
- '1.82'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
- '6'
numpy:
- '1.26'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -40,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
9 changes: 3 additions & 6 deletions .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
libboost_devel:
- '1.82'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
- '6'
numpy:
- '1.26'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -40,4 +38,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/win_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/win_64_numpy1.22python3.9.____73_pypypython_implpypy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
1 change: 0 additions & 1 deletion .ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
9 changes: 3 additions & 6 deletions .ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
boost_cpp:
- 1.78.0
c_compiler:
- vs2019
channel_sources:
- conda-forge/label/python_rc,conda-forge
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libboost_devel:
- '1.82'
numpy:
- '1.26'
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -28,4 +26,3 @@ zip_keys:
- - python
- numpy
- python_impl
- channel_sources
2 changes: 1 addition & 1 deletion recipe/bld.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if [%python_impl%] == [pypy] (
^"
) else (
set ^"CMAKE_OPTIONS=!CMAKE_OPTIONS! ^
-DENABLE_SIM=ON ^
-DENABLE_SIM=OFF ^
^"
)

Expand Down
6 changes: 1 addition & 5 deletions recipe/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ cmake_config_args=(
-DENABLE_N300=ON
-DENABLE_N320=ON
-DENABLE_PYTHON_API=ON
-DENABLE_SIM=OFF
-DENABLE_TESTS=OFF
-DENABLE_UTILS=ON
-DENABLE_USB=ON
Expand All @@ -54,11 +55,6 @@ if [[ $python_impl == "pypy" ]] ; then
-DPYTHON_LIBRARY=$PREFIX/lib/`$PYTHON -c "import sysconfig; print(sysconfig.get_config_var('LDLIBRARY'))"`
-DPYTHON_INCLUDE_DIR=`$PYTHON -c "import sysconfig; print(sysconfig.get_paths()['include'])"`
-DUHD_PYTHON_DIR=$SP_DIR
-DENABLE_SIM=OFF
)
else
cmake_config_args+=(
-DENABLE_SIM=ON
)
fi

Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ source:
- 0006-lib-types-Declare-types-used-with-digital_filter_-ba.patch

build:
number: 1
number: 2
run_exports:
- {{ pin_subpackage('uhd', min_pin='x.x.x', max_pin='x.x.x') }}
entry_points: # [not linux]
Expand Down

0 comments on commit 1eb1d46

Please sign in to comment.