Merge branch 'gnuradio:main' into mait/build-on-hurd

maitbot · Oct 9, 2023 · feec113 · feec113
2 parents da56a65 + c52259f
commit feec113
Show file tree

Hide file tree

Showing 1,243 changed files with 33,137 additions and 20,053 deletions.
diff --git a/...pport/linux_64_python3.9.____cpython.yaml → ...x_64_numpy1.21python3.10.____cpython.yaml b/...pport/linux_64_python3.9.____cpython.yaml → ...x_64_numpy1.21python3.10.____cpython.yaml
@@ -1,7 +1,7 @@
 alsa_lib:
-- 1.2.3
+- 1.2.7
 boost_cpp:
-- 1.74.0
+- 1.78.0
 c_compiler:
 - gcc
 c_compiler_version:
@@ -24,42 +24,34 @@ gmp:
 - '6'
 gsl:
 - '2.7'
-libcblas:
-- 3.8 *netlib
 libiio:
 - '0'
+libsndfile:
+- '1.1'
 libthrift:
-- 0.15.0
+- 0.16.0
 numpy:
-- '1.19'
+- '1.21'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  fftw:
-    max_pin: x
-  gmp:
-    max_pin: x
   python:
     min_pin: x.x
     max_pin: x.x
-  qt:
-    max_pin: x.x
-  zeromq:
-    max_pin: x.x
 pybind11_abi:
 - '4'
 python:
-- 3.9.* *_cpython
-qt:
-- '5.12'
+- 3.10.* *_cpython
+qt_main:
+- '5.15'
 soapysdr:
 - '0.8'
 spdlog:
-- '1.9'
+- '1.10'
 target_platform:
 - linux-64
 uhd:
-- 4.1.0
+- 4.3.0
 volk:
 - '2.5'
 zeromq:

diff --git a/.ci_support/migrations/qt515.yaml b/.ci_support/migrations/qt515.yaml
@@ -0,0 +1,10 @@
+migrator_ts: 1653771978
+__migrator:
+  kind: version
+  migration_number: 1
+  bump_number: 1
+
+qt:
+  - 5.15
+qt_main:
+  - 5.15
diff --git a/...support/osx_64_python3.9.____cpython.yaml → ...x_64_numpy1.21python3.10.____cpython.yaml b/...support/osx_64_python3.9.____cpython.yaml → ...x_64_numpy1.21python3.10.____cpython.yaml
@@ -1,21 +1,19 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.15'
-MACOSX_SDK_VERSION:
-- '10.15'
+- '10.9'
 boost_cpp:
-- 1.74.0
+- 1.78.0
 c_compiler:
 - clang
 c_compiler_version:
-- '12'
+- '14'
 channel_sources:
 - conda-forge
 channel_targets:
 - gnuradio main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '12'
+- '14'
 fftw:
 - '3'
 gmp:
@@ -24,40 +22,34 @@ gsl:
 - '2.7'
 libiio:
 - '0'
+libsndfile:
+- '1.1'
 libthrift:
-- 0.15.0
+- 0.16.0
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:
-- '1.19'
+- '1.21'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  fftw:
-    max_pin: x
-  gmp:
-    max_pin: x
   python:
     min_pin: x.x
     max_pin: x.x
-  qt:
-    max_pin: x.x
-  zeromq:
-    max_pin: x.x
 pybind11_abi:
 - '4'
 python:
-- 3.9.* *_cpython
-qt:
-- '5.12'
+- 3.10.* *_cpython
+qt_main:
+- '5.15'
 soapysdr:
 - '0.8'
 spdlog:
-- '1.9'
+- '1.10'
 target_platform:
 - osx-64
 uhd:
-- 4.1.0
+- 4.3.0
 volk:
 - '2.5'
 zeromq:

diff --git a/...support/win_64_python3.9.____cpython.yaml → ...n_64_numpy1.21python3.10.____cpython.yaml b/...support/win_64_python3.9.____cpython.yaml → ...n_64_numpy1.21python3.10.____cpython.yaml
@@ -1,47 +1,43 @@
 boost_cpp:
-- 1.74.0
+- 1.78.0
 c_compiler:
-- vs2017
+- vs2019
 channel_sources:
 - conda-forge
 channel_targets:
 - gnuradio main
 cxx_compiler:
-- vs2017
+- vs2019
 fftw:
 - '3'
 gsl:
 - '2.7'
 libiio:
 - '0'
+libsndfile:
+- '1.1'
 numpy:
-- '1.19'
+- '1.21'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  fftw:
-    max_pin: x
   python:
     min_pin: x.x
     max_pin: x.x
-  qt:
-    max_pin: x.x
-  zeromq:
-    max_pin: x.x.x
 pybind11_abi:
 - '4'
 python:
-- 3.9.* *_cpython
-qt:
-- '5.12'
+- 3.10.* *_cpython
+qt_main:
+- '5.15'
 soapysdr:
 - '0.8'
 spdlog:
-- '1.9'
+- '1.10'
 target_platform:
 - win-64
 uhd:
-- 4.1.0
+- 4.3.0
 volk:
 - '2.5'
 zeromq: