diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index b056ac03..a2f9a6a0 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 96d8a009..455658be 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 716fac6b..c14bf9ee 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml similarity index 89% rename from .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 6ecafb4d..3d4177c4 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,23 +11,23 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: -- '1.22' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 9827e425..adc753b5 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,13 +15,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 19ce4afc..bee41835 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,13 +15,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index f516c7d2..b17b568f 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,13 +15,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml similarity index 90% rename from .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 60998df1..19c28724 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,23 +15,23 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: -- '1.22' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index e3411bca..3911f98a 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 96e66c1e..b2c403f2 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 49c0b9ad..046b54fd 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +11,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml similarity index 89% rename from .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 576489eb..8f2b7b77 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,23 +11,23 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 gmp: - '6' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' numpy: -- '1.22' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 69008603..bf90167e 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '18' channel_sources: - conda-forge channel_targets: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' macos_machine: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 9cac7669..803a880a 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '18' channel_sources: - conda-forge channel_targets: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' macos_machine: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 418d4ab0..9752c1e9 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '18' channel_sources: - conda-forge channel_targets: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' macos_machine: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml similarity index 84% rename from .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index f2d24928..365bd91b 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '18' channel_sources: - conda-forge channel_targets: @@ -11,21 +13,21 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index cc2ac42d..f70a9561 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '18' channel_sources: - conda-forge channel_targets: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' macos_machine: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 9059e2d6..de4d19db 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '18' channel_sources: - conda-forge channel_targets: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' macos_machine: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index afb61750..92362523 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '18' channel_sources: - conda-forge channel_targets: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' macos_machine: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml similarity index 84% rename from .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 4b728f41..1ed1af5c 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '18' channel_sources: - conda-forge channel_targets: @@ -11,21 +13,21 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' gnuradio_core: -- 3.10.6 +- 3.10.11 gnuradio_extra_pin: - '' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '1.26' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml new file mode 100644 index 00000000..e90c55ea --- /dev/null +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -0,0 +1,25 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- tapparelj main +cxx_compiler: +- vs2019 +gnuradio_core: +- 3.10.11 +gnuradio_extra_pin: +- '' +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml new file mode 100644 index 00000000..ea06ef6a --- /dev/null +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -0,0 +1,25 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- tapparelj main +cxx_compiler: +- vs2019 +gnuradio_core: +- 3.10.11 +gnuradio_extra_pin: +- '' +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 00000000..27f746e3 --- /dev/null +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,25 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- tapparelj main +cxx_compiler: +- vs2019 +gnuradio_core: +- 3.10.11 +gnuradio_extra_pin: +- '' +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..69b71bdf --- /dev/null +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,25 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- tapparelj main +cxx_compiler: +- vs2019 +gnuradio_core: +- 3.10.11 +gnuradio_extra_pin: +- '' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- win-64 +zip_keys: +- - python + - numpy diff --git a/.conda/conda-forge.yml b/.conda/conda-forge.yml index d0932f99..211169f2 100644 --- a/.conda/conda-forge.yml +++ b/.conda/conda-forge.yml @@ -14,10 +14,11 @@ os_version: provider: linux: github_actions osx: github_actions - #win: github_actions + win: github_actions # uncomment to enable additional linux platforms #linux_aarch64: github_actions #linux_ppc64le: github_actions + recipe_dir: .conda/recipe # skip unnecessary files since this is not a full-fledged conda-forge feedstock skip_render: diff --git a/.conda/recipe/conda_build_config.yaml b/.conda/recipe/conda_build_config.yaml index 040205e4..f1aa706c 100644 --- a/.conda/recipe/conda_build_config.yaml +++ b/.conda/recipe/conda_build_config.yaml @@ -5,7 +5,7 @@ channel_targets: # override the conda-forge pin for gnuradio-core by uncommenting # and specifying a different version here gnuradio_core: - - "3.10.6" + - "3.10.11" gnuradio_extra_pin: # always leave one entry with the empty string - "" diff --git a/.conda/recipe/meta.yaml b/.conda/recipe/meta.yaml index 09a7e109..ff050109 100644 --- a/.conda/recipe/meta.yaml +++ b/.conda/recipe/meta.yaml @@ -19,8 +19,8 @@ source: build: number: 0 - skip: true # [win] - skip: true # [py>=312] + skip: false # [win] + skip: false # [py>=313] requirements: build: @@ -36,8 +36,8 @@ requirements: - numpy # [build_platform != target_platform] - pybind11 # [build_platform != target_platform] # Add extra build tool dependencies here - - boost-cpp=1.78.0 - - volk=3.0.0 + - boost-cpp=1.84.0 + - volk=3.1.2 host: - gmp # [linux] @@ -49,15 +49,15 @@ requirements: - python - numpy # Add/remove library dependencies here - - boost-cpp=1.78.0 - - volk=3.0.0 + - boost-cpp=1.84.0 + - volk=3.1.2 run: - numpy - python # Add/remove runtime dependencies here - - boost-cpp=1.78.0 - - volk=3.0.0 + - boost-cpp=1.84.0 + - volk=3.1.2 test: requires: diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 0535f6aa..00000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - status: {} - check_suite: - types: - - completed - -jobs: - automerge-action: - runs-on: ubuntu-latest - name: automerge - steps: - - name: automerge-action - id: automerge-action - uses: conda-forge/automerge-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index fd9fd475..c7fb8a76 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -29,12 +29,6 @@ jobs: os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_numpy1.22python3.8.____cpython - SHORT_CONFIG: linux_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['ubuntu-latest'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - CONFIG: linux_64_numpy1.22python3.9.____cpython SHORT_CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: True @@ -47,14 +41,14 @@ jobs: os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_aarch64_numpy1.22python3.10.____cpython - SHORT_CONFIG: linux_aarch64_numpy1.22python3.10.____cpython + - CONFIG: linux_64_numpy1.26python3.12.____cpython + SHORT_CONFIG: linux_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_aarch64_numpy1.22python3.8.____cpython - SHORT_CONFIG: linux_aarch64_numpy1.22python3.8.____cpython + - CONFIG: linux_aarch64_numpy1.22python3.10.____cpython + SHORT_CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] @@ -71,14 +65,14 @@ jobs: os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython - SHORT_CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython + - CONFIG: linux_aarch64_numpy1.26python3.12.____cpython + SHORT_CONFIG: linux_aarch64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython - SHORT_CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython + - CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython + SHORT_CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] @@ -95,16 +89,17 @@ jobs: os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + - CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + SHORT_CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['ubuntu-latest'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - CONFIG: osx_64_numpy1.22python3.10.____cpython SHORT_CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: True os: macos runs_on: ['macos-13'] - - CONFIG: osx_64_numpy1.22python3.8.____cpython - SHORT_CONFIG: osx_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: True - os: macos - runs_on: ['macos-13'] - CONFIG: osx_64_numpy1.22python3.9.____cpython SHORT_CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: True @@ -115,13 +110,13 @@ jobs: UPLOAD_PACKAGES: True os: macos runs_on: ['macos-13'] - - CONFIG: osx_arm64_numpy1.22python3.10.____cpython - SHORT_CONFIG: osx_arm64_numpy1.22python3.10.____cpython + - CONFIG: osx_64_numpy1.26python3.12.____cpython + SHORT_CONFIG: osx_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: True os: macos runs_on: ['macos-13'] - - CONFIG: osx_arm64_numpy1.22python3.8.____cpython - SHORT_CONFIG: osx_arm64_numpy1.22python3.8.____cpython + - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + SHORT_CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: True os: macos runs_on: ['macos-13'] @@ -135,10 +130,35 @@ jobs: UPLOAD_PACKAGES: True os: macos runs_on: ['macos-13'] + - CONFIG: osx_arm64_numpy1.26python3.12.____cpython + SHORT_CONFIG: osx_arm64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: True + os: macos + runs_on: ['macos-13'] + - CONFIG: win_64_numpy1.22python3.10.____cpython + SHORT_CONFIG: win_64_numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: True + os: windows + runs_on: ['windows-latest'] + - CONFIG: win_64_numpy1.22python3.9.____cpython + SHORT_CONFIG: win_64_numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: True + os: windows + runs_on: ['windows-latest'] + - CONFIG: win_64_numpy1.23python3.11.____cpython + SHORT_CONFIG: win_64_numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: True + os: windows + runs_on: ['windows-latest'] + - CONFIG: win_64_numpy1.26python3.12.____cpython + SHORT_CONFIG: win_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: True + os: windows + runs_on: ['windows-latest'] steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 0 @@ -191,13 +211,6 @@ jobs: fi ./.scripts/run_osx_build.sh - - name: Install Miniconda for windows - uses: conda-incubator/setup-miniconda@v3 - with: - miniforge-version: latest - miniforge-variant: Mambaforge - if: matrix.os == 'windows' - - name: Build on windows shell: cmd run: | @@ -206,6 +219,7 @@ jobs: set "sha=%GITHUB_SHA%" call ".scripts\run_win_build.bat" env: + MINIFORGE_HOME: D:\Miniforge PYTHONUNBUFFERED: 1 CONFIG: ${{ matrix.CONFIG }} CI: github_actions @@ -221,6 +235,7 @@ jobs: CONFIG: ${{ matrix.CONFIG }} SHORT_CONFIG: ${{ matrix.SHORT_CONFIG }} OS: ${{ matrix.os }} + MINIFORGE_HOME_WIN: D:\Miniforge run: | export CI=github_actions export CI_RUN_ID=$GITHUB_RUN_ID @@ -229,7 +244,7 @@ jobs: if [ $OS == "macos" ]; then export CONDA_BLD_DIR="${MINIFORGE_HOME:-${HOME}/miniforge3}/conda-bld" elif [ $OS == "windows" ]; then - export CONDA_BLD_DIR="${CONDA//\\//}/conda-bld" + export CONDA_BLD_DIR="${MINIFORGE_HOME_WIN//\\//}/conda-bld" else export CONDA_BLD_DIR="build_artifacts" fi @@ -248,7 +263,7 @@ jobs: continue-on-error: true - name: Store conda build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 if: ${{ always() && steps.prepare-artifacts.outcome == 'success' }} with: name: ${{ steps.prepare-artifacts.outputs.BLD_ARTIFACT_NAME }} @@ -257,7 +272,7 @@ jobs: continue-on-error: true - name: Store conda build environment artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 if: ${{ failure() && steps.prepare-artifacts.outcome == 'success' }} with: name: ${{ steps.prepare-artifacts.outputs.ENV_ARTIFACT_NAME }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml deleted file mode 100644 index d6f06b5c..00000000 --- a/.github/workflows/webservices.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: repository_dispatch - -jobs: - webservices: - runs-on: ubuntu-latest - name: webservices - steps: - - name: webservices - id: webservices - uses: conda-forge/webservices-dispatch-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ddccc5d1..352d0523 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,18 +31,20 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -72,6 +74,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Uploading packages" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 641aa3ee..6fe1f3cf 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -7,28 +7,39 @@ source .scripts/logging_utils.sh set -xe MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} +MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash -( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null - -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -rm -rf ${MINIFORGE_HOME} -bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +echo "Activating environment" +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + @@ -86,6 +97,13 @@ else --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./.conda/recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null + ( startgroup "Uploading packages" ) 2> /dev/null if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 00000000..ff599adc --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,148 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: MINIFORGE_HOME: where to install the base conda environment +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +FOR %%A IN ("%~dp0.") DO SET "REPO_ROOT=%%~dpA" +if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" +:: Remove trailing backslash, if present +if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" +call :start_group "Provisioning base env with micromamba" +set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" +set "MICROMAMBA_VERSION=1.5.10-0" +set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" +set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" +set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" + +echo Downloading micromamba %MICROMAMBA_VERSION% +if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" +certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" +if !errorlevel! neq 0 exit /b !errorlevel! + +echo Creating environment +call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ + --channel conda-forge ^ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +if !errorlevel! neq 0 exit /b !errorlevel! +echo Removing %MAMBA_ROOT_PREFIX% +del /S /Q "%MAMBA_ROOT_PREFIX%" +del /S /Q "%MICROMAMBA_TMPDIR%" + +call :start_group "Configuring conda" + +:: Activate the base conda environment +echo Activating environment +call "%MINIFORGE_HOME%\Scripts\activate.bat" +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\.conda/recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt ".conda/recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe ".conda/recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\.conda/recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" +call :end_group + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) +set "UPLOAD_ON_BRANCH=master" +:: Note, this needs GIT_BRANCH too + +:: Validate + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package .\ ".\.conda/recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file