Merge pull request #2 from ryanvolz/conda-test

Rebuild for gnuradio 3.10.10
radioconda · May 8, 2024 · 0b237f6 · 0b237f6
2 parents e5e15ce + a486b9e
commit 0b237f6
Show file tree

Hide file tree

Showing 32 changed files with 123 additions and 90 deletions.
diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml
@@ -19,7 +19,7 @@ fftw:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml
@@ -19,7 +19,7 @@ fftw:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml
@@ -19,7 +19,7 @@ fftw:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml
@@ -19,7 +19,7 @@ fftw:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

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

diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml
@@ -23,7 +23,7 @@ fftw:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml
@@ -23,7 +23,7 @@ fftw:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml
@@ -23,7 +23,7 @@ fftw:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

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

diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml
@@ -19,7 +19,7 @@ fftw:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml
@@ -19,7 +19,7 @@ fftw:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml
@@ -19,7 +19,7 @@ fftw:
 gmp:
 - '6'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

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:
@@ -15,7 +15,7 @@ cxx_compiler_version:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

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:
@@ -15,7 +15,7 @@ cxx_compiler_version:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

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:
@@ -15,7 +15,7 @@ cxx_compiler_version:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

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:
@@ -15,7 +15,7 @@ cxx_compiler_version:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml
@@ -9,7 +9,7 @@ cxx_compiler:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml
@@ -9,7 +9,7 @@ cxx_compiler:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

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

diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml
@@ -9,7 +9,7 @@ cxx_compiler:
 fftw:
 - '3'
 gnuradio_core:
-- 3.10.9
+- 3.10.10
 gnuradio_extra_pin:
 - ''
 libboost_devel:

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:-}"

diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
@@ -26,9 +26,9 @@ 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 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"
 
 
 
@@ -81,7 +81,7 @@ else
         EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
     fi
 
-    conda mambabuild ./.conda/recipe -m ./.ci_support/${CONFIG}.yaml \
+    conda-build ./.conda/recipe -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 / @@ -19,7 +19,7 @@ fftw: @@
     gmp:
     - '6'
     gnuradio_core:
-    - 3.10.9
+    - 3.10.10
     gnuradio_extra_pin:
     - ''
     libboost_devel:
@@ Expand Down @@