MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.25.1, and co…

…nda-forge-pinning 2023.09.11.09.30.22
ryanvolz · Sep 11, 2023 · 8f4ba59 · 8f4ba59
1 parent 75a8cba
commit 8f4ba59
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 49 deletions.
diff --git a/...x_64_numpy1.21python3.10.____cpython.yaml → ...port/linux_64_python3.10.____cpython.yaml b/...x_64_numpy1.21python3.10.____cpython.yaml → ...port/linux_64_python3.10.____cpython.yaml
@@ -1,11 +1,11 @@
 alsa_lib:
-- 1.2.7
+- 1.2.9
 boost_cpp:
 - 1.78.0
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_name:
 - cos7
 channel_sources:
@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fftw:
@@ -27,11 +27,11 @@ gsl:
 libiio:
 - '0'
 libsndfile:
-- '1.1'
+- '1.2'
 libthrift:
-- 0.16.0
+- 0.18.1
 numpy:
-- '1.21'
+- '1.22'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -40,20 +40,22 @@ pin_run_as_build:
     max_pin: x.x
 pybind11_abi:
 - '4'
+pyqt:
+- '5.15'
 python:
 - 3.10.* *_cpython
 qt_main:
 - '5.15'
 soapysdr:
 - '0.8'
 spdlog:
-- '1.10'
+- '1.11'
 target_platform:
 - linux-64
 uhd:
-- 4.3.0
+- 4.4.0
 volk:
-- '2.5'
+- '3.0'
 zeromq:
 - 4.3.4
 zip_keys:

diff --git a/.ci_support/migrations/qt515.yaml b/.ci_support/migrations/qt515.yaml
diff --git a/...x_64_numpy1.21python3.10.____cpython.yaml → ...upport/osx_64_python3.10.____cpython.yaml b/...x_64_numpy1.21python3.10.____cpython.yaml → ...upport/osx_64_python3.10.____cpython.yaml
@@ -5,15 +5,15 @@ boost_cpp:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - gnuradio main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 fftw:
 - '3'
 gmp:
@@ -23,13 +23,13 @@ gsl:
 libiio:
 - '0'
 libsndfile:
-- '1.1'
+- '1.2'
 libthrift:
-- 0.16.0
+- 0.18.1
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:
-- '1.21'
+- '1.22'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -38,20 +38,22 @@ pin_run_as_build:
     max_pin: x.x
 pybind11_abi:
 - '4'
+pyqt:
+- '5.15'
 python:
 - 3.10.* *_cpython
 qt_main:
 - '5.15'
 soapysdr:
 - '0.8'
 spdlog:
-- '1.10'
+- '1.11'
 target_platform:
 - osx-64
 uhd:
-- 4.3.0
+- 4.4.0
 volk:
-- '2.5'
+- '3.0'
 zeromq:
 - 4.3.4
 zip_keys:

diff --git a/...n_64_numpy1.21python3.10.____cpython.yaml → ...upport/win_64_python3.10.____cpython.yaml b/...n_64_numpy1.21python3.10.____cpython.yaml → ...upport/win_64_python3.10.____cpython.yaml
@@ -15,9 +15,11 @@ gsl:
 libiio:
 - '0'
 libsndfile:
-- '1.1'
+- '1.2'
+libthrift:
+- 0.18.1
 numpy:
-- '1.21'
+- '1.22'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
@@ -26,20 +28,22 @@ pin_run_as_build:
     max_pin: x.x
 pybind11_abi:
 - '4'
+pyqt:
+- '5.15'
 python:
 - 3.10.* *_cpython
 qt_main:
 - '5.15'
 soapysdr:
 - '0.8'
 spdlog:
-- '1.10'
+- '1.11'
 target_platform:
 - win-64
 uhd:
-- 4.3.0
+- 4.4.0
 volk:
-- '2.5'
+- '3.0'
 zeromq:
 - 4.3.4
 zip_keys:

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,25 @@
+# This file was generated automatically from conda-smithy. To update this configuration,
+# update the conda-forge.yml and/or the recipe/meta.yaml.
+# -*- mode: jinja-yaml -*-
+
+version: 2
+
+jobs:
+  build:
+    working_directory: ~/test
+    machine:
+      image: ubuntu-2004:current
+    steps:
+      - run:
+          # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
+          command: exit 0
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build:
+          filters:
+            branches:
+              ignore:
+                - /.*/
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -0,0 +1,19 @@
+on:
+  status: {}
+  check_suite:
+    types:
+      - completed
+
+jobs:
+  automerge-action:
+    runs-on: ubuntu-latest
+    name: automerge
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - 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
@@ -13,20 +13,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - CONFIG: linux_64_numpy1.21python3.10.____cpython
-            SHORT_CONFIG: linux_64_numpy1.21python3.10.____cpython
+          - CONFIG: linux_64_python3.10.____cpython
+            SHORT_CONFIG: linux_64_python3.10.____cpython
             UPLOAD_PACKAGES: True
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
             os: ubuntu
-          - CONFIG: win_64_numpy1.21python3.10.____cpython
-            SHORT_CONFIG: win_64_numpy1.21python3.10.____cpython
+          - CONFIG: win_64_python3.10.____cpython
+            SHORT_CONFIG: win_64_python3.10.____cpython
             UPLOAD_PACKAGES: True
             os: windows
-          - CONFIG: osx_64_numpy1.21python3.10.____cpython
-            SHORT_CONFIG: osx_64_numpy1.21python3.10.____cpython
+          - CONFIG: osx_64_python3.10.____cpython
+            SHORT_CONFIG: osx_64_python3.10.____cpython
             UPLOAD_PACKAGES: True
             os: macos
     steps:
+
     - name: Checkout code
       uses: actions/checkout@v3
       with:
@@ -84,11 +85,10 @@ jobs:
       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 "py-lief<0.12"
+        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 .\ ".\.packaging/conda_recipe" .\.ci_support\%CONFIG%.yaml
         if errorlevel 1 exit 1
-        
 
         if EXIST LICENSE.txt (
           copy LICENSE.txt ".packaging/conda_recipe\\recipe-scripts-license.txt"

diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml
@@ -0,0 +1,13 @@
+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
@@ -33,9 +33,9 @@ CONDARC
 
 
 mamba install --update-specs --yes --quiet --channel conda-forge \
-    conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12"
+    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 "py-lief<0.12"
+    conda-build pip boa conda-forge-ci-setup=3
 
 # set up the condarc
 setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh
@@ -79,8 +79,8 @@ if [[ ! -z "$BLD_ARTIFACT_PREFIX" ]]; then
         echo "##vso[task.setVariable variable=BLD_ARTIFACT_NAME]$BLD_ARTIFACT_NAME"
         echo "##vso[task.setVariable variable=BLD_ARTIFACT_PATH]$BLD_ARTIFACT_PATH"
     elif [[ "$CI" == "github_actions" ]]; then
-        echo "::set-output name=BLD_ARTIFACT_NAME::$BLD_ARTIFACT_NAME"
-        echo "::set-output name=BLD_ARTIFACT_PATH::$BLD_ARTIFACT_PATH"
+        echo "BLD_ARTIFACT_NAME=$BLD_ARTIFACT_NAME" >> $GITHUB_OUTPUT
+        echo "BLD_ARTIFACT_PATH=$BLD_ARTIFACT_PATH" >> $GITHUB_OUTPUT
     fi
 fi
 
@@ -107,7 +107,7 @@ if [[ ! -z "$ENV_ARTIFACT_PREFIX" ]]; then
         echo "##vso[task.setVariable variable=ENV_ARTIFACT_NAME]$ENV_ARTIFACT_NAME"
         echo "##vso[task.setVariable variable=ENV_ARTIFACT_PATH]$ENV_ARTIFACT_PATH"
     elif [[ "$CI" == "github_actions" ]]; then
-        echo "::set-output name=ENV_ARTIFACT_NAME::$ENV_ARTIFACT_NAME"
-        echo "::set-output name=ENV_ARTIFACT_PATH::$ENV_ARTIFACT_PATH"
+        echo "ENV_ARTIFACT_NAME=$ENV_ARTIFACT_NAME" >> $GITHUB_OUTPUT
+        echo "ENV_ARTIFACT_PATH=$ENV_ARTIFACT_PATH" >> $GITHUB_OUTPUT
     fi
 fi
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
@@ -24,9 +24,9 @@ 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 "py-lief<0.12"
+    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 "py-lief<0.12"
+    conda-build pip boa conda-forge-ci-setup=3
 
 
 
@@ -55,7 +55,6 @@ source run_conda_forge_build_setup
 echo -e "\n\nMaking the build clobber file"
 make_build_number ./ ./.packaging/conda_recipe ./.ci_support/${CONFIG}.yaml
 
-
 if [[ -f LICENSE.txt ]]; then
   cp LICENSE.txt ".packaging/conda_recipe/recipe-scripts-license.txt"
 fi
@@ -71,6 +70,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     # Drop into an interactive shell
     /bin/bash
 else
+
     conda mambabuild ./.packaging/conda_recipe -m ./.ci_support/${CONFIG}.yaml \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file ./.ci_support/clobber_${CONFIG}.yaml