diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 7583230..916655c 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -17,11 +17,11 @@ docker_image: gmp: - '6' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 3424fce..db02dcd 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -17,11 +17,11 @@ docker_image: gmp: - '6' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 5415fb2..f20ceca 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -17,11 +17,11 @@ docker_image: gmp: - '6' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..237f00d --- /dev/null +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,37 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- ryanvolz main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +gmp: +- '6' +gnuradio_core: +- 3.10.8 +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: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_aarch64_python3.10.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index eda9de8..155f587 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -21,11 +21,11 @@ docker_image: gmp: - '6' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_aarch64_python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 310c5a1..c78209a 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -21,11 +21,11 @@ docker_image: gmp: - '6' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_aarch64_python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index ec8fd6d..fa13743 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -21,11 +21,11 @@ docker_image: gmp: - '6' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..343da5f --- /dev/null +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,41 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- ryanvolz main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +gmp: +- '6' +gnuradio_core: +- 3.10.8 +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: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_python3.10.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 4ec095a..aa82d4d 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -17,11 +17,11 @@ docker_image: gmp: - '6' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index f23664c..651ae68 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -17,11 +17,11 @@ docker_image: gmp: - '6' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml similarity index 96% rename from .ci_support/linux_ppc64le_python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 8df348f..d5be188 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -17,11 +17,11 @@ docker_image: gmp: - '6' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..79b9a7e --- /dev/null +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,37 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- ryanvolz main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +gmp: +- '6' +gnuradio_core: +- 3.10.8 +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: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 93% rename from .ci_support/osx_64_python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 7e2e8cc..a675aee 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,15 +11,15 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 93% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 009059c..6f9a7cf 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,15 +11,15 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml similarity index 93% rename from .ci_support/osx_64_python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 59489a6..d100a99 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,15 +11,15 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..831deaa --- /dev/null +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- ryanvolz main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +gnuradio_core: +- 3.10.8 +gnuradio_extra_pin: +- '' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml similarity index 93% rename from .ci_support/osx_arm64_python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 7e50660..a42c43e 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,15 +11,15 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml similarity index 93% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index aab36bc..929bfe4 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,15 +11,15 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml similarity index 93% rename from .ci_support/osx_arm64_python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 45ece6a..029be80 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '15' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,15 +11,15 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' gnuradio_core: -- 3.10.7 +- 3.10.8 gnuradio_extra_pin: - '' macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..be3e1ad --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -0,0 +1,35 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- ryanvolz main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +gnuradio_core: +- 3.10.8 +gnuradio_extra_pin: +- '' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.23' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index c38e470..0582e1c 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -13,76 +13,100 @@ jobs: fail-fast: false matrix: include: - - CONFIG: linux_64_python3.10.____cpython - SHORT_CONFIG: linux_64_python3.10.____cpython + - CONFIG: linux_64_numpy1.22python3.10.____cpython + SHORT_CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 os: ubuntu - - CONFIG: linux_64_python3.8.____cpython - SHORT_CONFIG: linux_64_python3.8.____cpython + - CONFIG: linux_64_numpy1.22python3.8.____cpython + SHORT_CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 os: ubuntu - - CONFIG: linux_64_python3.9.____cpython - SHORT_CONFIG: linux_64_python3.9.____cpython + - CONFIG: linux_64_numpy1.22python3.9.____cpython + SHORT_CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 os: ubuntu - - CONFIG: linux_aarch64_python3.10.____cpython - SHORT_CONFIG: linux_aarch64_python3.10.____cpython + - CONFIG: linux_64_numpy1.23python3.11.____cpython + SHORT_CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 os: ubuntu - - CONFIG: linux_aarch64_python3.8.____cpython - SHORT_CONFIG: linux_aarch64_python3.8.____cpython + - CONFIG: linux_aarch64_numpy1.22python3.10.____cpython + SHORT_CONFIG: linux_aarch64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 os: ubuntu - - CONFIG: linux_aarch64_python3.9.____cpython - SHORT_CONFIG: linux_aarch64_python3.9.____cpython + - CONFIG: linux_aarch64_numpy1.22python3.8.____cpython + SHORT_CONFIG: linux_aarch64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 os: ubuntu - - CONFIG: linux_ppc64le_python3.10.____cpython - SHORT_CONFIG: linux_ppc64le_python3.10.____cpython + - CONFIG: linux_aarch64_numpy1.22python3.9.____cpython + SHORT_CONFIG: linux_aarch64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 os: ubuntu - - CONFIG: linux_ppc64le_python3.8.____cpython - SHORT_CONFIG: linux_ppc64le_python3.8.____cpython + - CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + SHORT_CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 os: ubuntu - - CONFIG: linux_ppc64le_python3.9.____cpython - SHORT_CONFIG: linux_ppc64le_python3.9.____cpython + - CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython + SHORT_CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 os: ubuntu - - CONFIG: osx_64_python3.10.____cpython - SHORT_CONFIG: osx_64_python3.10.____cpython + - CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython + SHORT_CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: True + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + os: ubuntu + - CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython + SHORT_CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: True + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + os: ubuntu + - CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + SHORT_CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: True + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + os: ubuntu + - CONFIG: osx_64_numpy1.22python3.10.____cpython + SHORT_CONFIG: osx_64_numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: True + os: macos + - CONFIG: osx_64_numpy1.22python3.8.____cpython + SHORT_CONFIG: osx_64_numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: True + os: macos + - CONFIG: osx_64_numpy1.22python3.9.____cpython + SHORT_CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: True os: macos - - CONFIG: osx_64_python3.8.____cpython - SHORT_CONFIG: osx_64_python3.8.____cpython + - CONFIG: osx_64_numpy1.23python3.11.____cpython + SHORT_CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: True os: macos - - CONFIG: osx_64_python3.9.____cpython - SHORT_CONFIG: osx_64_python3.9.____cpython + - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + SHORT_CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: True os: macos - - CONFIG: osx_arm64_python3.10.____cpython - SHORT_CONFIG: osx_arm64_python3.10.____cpython + - CONFIG: osx_arm64_numpy1.22python3.8.____cpython + SHORT_CONFIG: osx_arm64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: True os: macos - - CONFIG: osx_arm64_python3.8.____cpython - SHORT_CONFIG: osx_arm64_python3.8.____cpython + - CONFIG: osx_arm64_numpy1.22python3.9.____cpython + SHORT_CONFIG: osx_arm64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: True os: macos - - CONFIG: osx_arm64_python3.9.____cpython - SHORT_CONFIG: osx_arm64_python3.9.____cpython + - CONFIG: osx_arm64_numpy1.23python3.11.____cpython + SHORT_CONFIG: osx_arm64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: True os: macos steps: + - name: Checkout code uses: actions/checkout@v3 with: @@ -136,33 +160,11 @@ jobs: miniforge-version: latest miniforge-variant: Mambaforge if: matrix.os == 'windows' + - name: Build on windows shell: cmd run: | - call activate base - mamba.exe install -c conda-forge 'python=3.9' conda-build conda pip boa conda-forge-ci-setup=3 - if errorlevel 1 exit 1 - setup_conda_rc .\ ".\.conda/recipe" .\.ci_support\%CONFIG%.yaml - if errorlevel 1 exit 1 - - - if EXIST LICENSE.txt ( - copy LICENSE.txt ".conda/recipe\\recipe-scripts-license.txt" - ) - conda.exe mambabuild ".conda/recipe" -m .ci_support\%CONFIG%.yaml - if errorlevel 1 exit 1 - 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" - ) - if /i "%UPLOAD_PACKAGES%" == "true" ( - if /i "%IS_PR_BUILD%" == "false" ( - upload_package .\ ".\.conda/recipe" .ci_support\%CONFIG%.yaml - ) - ) + call ".scripts\run_win_build.bat" env: PYTHONUNBUFFERED: 1 CONFIG: ${{ matrix.CONFIG }} diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 1f03510..e10028d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 2d28bc4..b632765 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3