Merge pull request #3 from ryanvolz/conda-test

Rebuild for gnuradio 3.10.10
radioconda · May 8, 2024 · 751a652 · 751a652
2 parents d379e21 + 6487657
commit 751a652
Show file tree

Hide file tree

Showing 33 changed files with 94 additions and 87 deletions.
diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml
@@ -17,7 +17,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 numpy:

diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml
@@ -17,7 +17,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 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
@@ -17,7 +17,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 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
@@ -17,7 +17,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 numpy:

diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml
@@ -21,7 +21,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 numpy:

diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml
@@ -21,7 +21,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 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
@@ -21,7 +21,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 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
@@ -21,7 +21,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 numpy:

diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml
@@ -17,7 +17,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 numpy:

diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml
@@ -17,7 +17,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 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
@@ -17,7 +17,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 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
@@ -17,7 +17,7 @@ docker_image:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 numpy:

diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
@@ -1,5 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 macos_machine:

diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
@@ -1,5 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 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
@@ -1,5 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 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
@@ -1,5 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
+- '10.13'
 c_compiler:
 - clang
 c_compiler_version:
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 macos_machine:

diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 macos_machine:

diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 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
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 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
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 macos_machine:

diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 numpy:

diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 numpy:

diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 numpy:

diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 numpy:

diff --git a/.conda/recipe/meta.yaml b/.conda/recipe/meta.yaml
@@ -80,8 +80,8 @@ test:
     # verify that examples get installed
     {% set example_grcs = ["lora_RX", "lora_TX", "tx_rx_functionality_check", "tx_rx_simulation", "tx_rx_usrp"] %}
     {% for eg in example_grcs %}
-    - grcc $PREFIX/share/gr-{{ oot_name }}/examples/{{ eg }}.grc  # [not win]
-    - grcc %PREFIX%\\Library\\share\\gr-{{ oot_name}}\\examples\\{{ eg }}.grc  # [win]
+    - grcc $PREFIX/share/gnuradio/examples/{{ oot_name }}/{{ eg }}.grc  # [not win]
+    - grcc %PREFIX%\\Library\\share\\gnuradio\\examples\\{{ oot_name }}\\{{ eg }}.grc  # [win]
     {% endfor %}
 
   imports:
@@ -111,10 +111,10 @@ about:
         - (Windows) `%CONDA_PREFIX%\share\gr-lora_sdr\examples`
     <br>
     If you find this module useful for your project, please consider citing the
-    publication "An Open-Source LoRa Physical Layer Prototype on GNU Radio" 
-    (<a href="https://ieeexplore.ieee.org/document/9154273">IEEE Xplore</a>,  
+    publication "An Open-Source LoRa Physical Layer Prototype on GNU Radio"
+    (<a href="https://ieeexplore.ieee.org/document/9154273">IEEE Xplore</a>,
     <a href="https://arxiv.org/abs/2002.08208">arXiv</a>)
     <h3>Installation issue</h3>
     Add conda-forge to the list of channel for installation with:<br>
     `conda install -c tapparelj -c conda-forge gnuradio-lora_sdr`
-    
+
diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -95,70 +95,70 @@ jobs:
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - 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.8.____cpython
-            SHORT_CONFIG: win_64_numpy1.22python3.8.____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: osx_64_numpy1.22python3.10.____cpython
             SHORT_CONFIG: osx_64_numpy1.22python3.10.____cpython
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            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-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_64_numpy1.22python3.9.____cpython
             SHORT_CONFIG: osx_64_numpy1.22python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_64_numpy1.23python3.11.____cpython
             SHORT_CONFIG: osx_64_numpy1.23python3.11.____cpython
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_arm64_numpy1.22python3.10.____cpython
             SHORT_CONFIG: osx_arm64_numpy1.22python3.10.____cpython
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_arm64_numpy1.22python3.8.____cpython
             SHORT_CONFIG: osx_arm64_numpy1.22python3.8.____cpython
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_arm64_numpy1.22python3.9.____cpython
             SHORT_CONFIG: osx_arm64_numpy1.22python3.9.____cpython
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            runs_on: ['macos-13']
           - CONFIG: osx_arm64_numpy1.23python3.11.____cpython
             SHORT_CONFIG: osx_arm64_numpy1.23python3.11.____cpython
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-latest']
+            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.8.____cpython
+            SHORT_CONFIG: win_64_numpy1.22python3.8.____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']
     steps:
 
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -212,7 +212,7 @@ jobs:
         ./.scripts/run_osx_build.sh
 
     - name: Install Miniconda for windows
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
         miniforge-version: latest
         miniforge-variant: Mambaforge

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
@@ -34,9 +34,9 @@ CONDARC
 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 boa conda-forge-ci-setup=4
+    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 boa conda-forge-ci-setup=4
+    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}"
@@ -76,7 +76,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     # Drop into an interactive shell
     /bin/bash
 else
-    conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
+    conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
         --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:-}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ docker_image: @@
     gmp:
     - '6'
     gnuradio_core:
-    - 3.10.9
+    - 3.10.10
     gnuradio_extra_pin:
     - ''
     numpy:
@@ Expand Down @@