diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index b056ac03..0a9b2c06 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,9 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +13,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..cc928b14 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,9 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +13,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..4c79e61f 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,9 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +13,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 87% rename from .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 6ecafb4d..0e355479 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -1,7 +1,9 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,23 +13,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..cb247d4a 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,11 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,13 +17,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..435ad1e1 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,11 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,13 +17,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..d4d0ae3e 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,11 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,13 +17,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 88% rename from .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 60998df1..5bac1cd6 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,11 @@ BUILD: - aarch64-conda_cos7-linux-gnu +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_arch: - aarch64 cdt_name: @@ -15,23 +17,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..2718d8b7 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,9 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +13,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..3d21809b 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,9 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +13,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..dcafbcf0 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,9 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,13 +13,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 87% rename from .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 576489eb..37590c48 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -1,7 +1,9 @@ +ace: +- 8.0.1 c_compiler: - gcc c_compiler_version: -- '12' +- '13' cdt_name: - cos7 channel_sources: @@ -11,23 +13,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..76bfad28 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -11,9 +15,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' 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..e9977dd5 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -11,9 +15,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' 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..eb2e63b9 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -11,9 +15,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' 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 82% rename from .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index f2d24928..ef49752a 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -11,21 +15,21 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' 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..579a228b 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -11,9 +15,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' 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..9549c5bd 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -11,9 +15,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' 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..e8887e07 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -11,9 +15,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' 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 82% rename from .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 4b728f41..d6181c9e 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' +ace: +- 8.0.1 c_compiler: - clang c_compiler_version: -- '16' +- '17' channel_sources: - conda-forge channel_targets: @@ -11,21 +15,21 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' 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/.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..36b459e9 100644 --- a/.conda/recipe/meta.yaml +++ b/.conda/recipe/meta.yaml @@ -20,7 +20,7 @@ source: build: number: 0 skip: true # [win] - skip: true # [py>=312] + skip: true # [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/conda-build.yml b/.github/workflows/conda-build.yml index fd9fd475..6dd0dd26 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,6 +130,11 @@ 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'] steps: - name: Checkout code @@ -191,13 +191,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 +199,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 +215,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 +224,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 +243,7 @@ jobs: continue-on-error: true - name: Store conda build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() && steps.prepare-artifacts.outcome == 'success' }} with: name: ${{ steps.prepare-artifacts.outputs.BLD_ARTIFACT_NAME }} @@ -257,7 +252,7 @@ jobs: continue-on-error: true - name: Store conda build environment artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ failure() && steps.prepare-artifacts.outcome == 'success' }} with: name: ${{ steps.prepare-artifacts.outputs.ENV_ARTIFACT_NAME }} 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..06b0765f 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 +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