Autopep8b

.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml

@@ -20,6 +20,8 @@ docker_image:
 - quay.io/condaforge/linux-anvil-comp7
 fftw:
 - '3'
+fmt:
+- '8'
 gmp:
 - '6'
 gsl:
@@ -44,6 +46,8 @@ pin_run_as_build:
     max_pin: x.x
   qt:
     max_pin: x.x
+  spdlog:
+    max_pin: x.x
   zeromq:
     max_pin: x.x
 pybind11_abi:
@@ -54,6 +58,8 @@ qt:
 - '5.12'
 soapysdr:
 - '0.8'
+spdlog:
+- '1.8'
 target_platform:
 - linux-64
 uhd:

.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml

@@ -18,6 +18,8 @@ cxx_compiler_version:
 - '11'
 fftw:
 - '3'
+fmt:
+- '8'
 gmp:
 - '6'
 gsl:
@@ -42,6 +44,8 @@ pin_run_as_build:
     max_pin: x.x
   qt:
     max_pin: x.x
+  spdlog:
+    max_pin: x.x
   zeromq:
     max_pin: x.x
 pybind11_abi:
@@ -52,6 +56,8 @@ qt:
 - '5.12'
 soapysdr:
 - '0.8'
+spdlog:
+- '1.8'
 target_platform:
 - osx-64
 uhd:

.ci_support/win_64_numpy1.18python3.8.____cpython.yaml

@@ -10,6 +10,8 @@ cxx_compiler:
 - vs2017
 fftw:
 - '3'
+fmt:
+- '8'
 gsl:
 - '2.6'
 libiio:
@@ -26,6 +28,8 @@ pin_run_as_build:
     max_pin: x.x
   qt:
     max_pin: x.x
+  spdlog:
+    max_pin: x.x
   zeromq:
     max_pin: x.x.x
 pybind11_abi:
@@ -36,6 +40,8 @@ qt:
 - '5.12'
 soapysdr:
 - '0.8'
+spdlog:
+- '1.8'
 target_platform:
 - win-64
 uhd:

.github/workflows/make-test.yml

@@ -19,6 +19,14 @@ jobs:
         source: '.'
         exclude: './volk'
         extensions: 'h,hpp,cpp,cc,cc.in'
+  check-python-formatting:
+    name: Check Python Formatting
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: quentinguidee/pep8-action@v1
+      with:
+        arguments: '--max-line-length=120 --ignore E265,E266,E402,E501,E704,E712,E713,E714,E711,E722,E741,W504,W605 --exclude *.yml.py'
   # Doxygen gets built separately. It has a lot of output and its own weirdness.
   doxygen:
     name: Doxygen
@@ -36,7 +44,7 @@ jobs:
       run: 'cd /build && make doxygen_target'
   linux-docker:
   # All of these shall depend on the formatting check (needs: check-formatting)
-    needs: check-formatting
+    needs: [check-formatting, check-python-formatting]
     runs-on: ubuntu-latest
     # The GH default is 360 minutes (it's also the max as of Feb-2021). However
     # we should fail sooner. The only reason to exceed this time is if a test

.packaging/conda_recipe/build.sh

@@ -19,7 +19,6 @@ cmake --build . --config Release --target install
 
 if [[ $target_platform == linux* ]] ; then
     SKIP_TESTS=(
-        qa_agc
         qa_cpp_py_binding
         qa_cpp_py_binding_set
         qa_ctrlport_probes
@@ -30,7 +29,6 @@ if [[ $target_platform == linux* ]] ; then
 else
     SKIP_TESTS=(
         qa_add_system_time
-        qa_agc
         qa_block_gateway
         qa_cpp_py_binding
         qa_cpp_py_binding_set
@@ -42,6 +40,8 @@ else
         qa_header_payload_demux
         qa_hier_block2
         qa_hier_block2_message_connections
+        qa_message_debug
+        qa_message_strobe
         qa_python_message_passing
         qa_rotator_cc
         qa_tcp_server_sink

.packaging/conda_recipe/meta.yaml

@@ -58,20 +58,21 @@ requirements:
     # use codec2 1.0.0 because 1.0.1 has header which fails on Windows (complex.h)
     - codec2 1.0.0*
     - fftw
+    - fmt
     - gmp  # [not win]
     - gsl
     # blas needed to link with gsl
     - libcblas  # [linux]
     - libsndfile
     - libthrift  # [not win]
-    - log4cpp
     - mako
     - mpir  # [win]
     - numpy
     - pip  # [win]
     - pybind11
     - pybind11-abi
     - python
+    - spdlog
     - thrift  # [not win]
     - volk
   # gnuradio.audio
@@ -88,7 +89,7 @@ requirements:
   # gnuradio.qtgui
     - pyqt
     - qt
-    - qwt <6.2
+    - qwt
   # gnuradio.soapy
     - soapysdr
   # gnuradio.uhd

.scripts/build_steps.sh

@@ -47,6 +47,7 @@ source run_conda_forge_build_setup
 make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
 
 
+
 ( endgroup "Configuring conda" ) 2> /dev/null
 
 if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then

.scripts/run_docker_build.sh

@@ -76,6 +76,7 @@ fi
 
 export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}"
 export IS_PR_BUILD="${IS_PR_BUILD:-False}"
+docker pull "${DOCKER_IMAGE}"
 docker run ${DOCKER_RUN_ARGS} \
            -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \
            -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \
@@ -91,9 +92,9 @@ docker run ${DOCKER_RUN_ARGS} \
            -e BUILD_WITH_CONDA_DEBUG \
            -e BUILD_OUTPUT_ID \
            -e BINSTAR_TOKEN \
-           $DOCKER_IMAGE \
+           "${DOCKER_IMAGE}" \
            bash \
-           /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh
+           "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh"
 
 # verify that the end of the script was reached
 test -f "$DONE_CANARY"

CMakeLists.txt

@@ -380,11 +380,6 @@ else()
   endif()
 endif()
 
-########################################################################
-# Configure Log4CPP
-########################################################################
-find_package(LOG4CPP REQUIRED)
-
 ########################################################################
 # Setup Native Capabilities Flag
 ########################################################################

cmake/Modules/GnuradioConfig.cmake.in

@@ -10,7 +10,7 @@ include(CMakeFindDependencyMacro)
 # Allows us to use all .cmake files in this directory
 list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}")
 
-find_dependency(LOG4CPP)
+find_dependency(spdlog)
 find_dependency(MPLIB)
 
 set(BOOST_REQUIRED_COMPONENTS
@@ -97,7 +97,11 @@ set(GR_COMPONENTS
   )
 
 foreach(target ${GR_COMPONENTS})
-  if (${target} IN_LIST Gnuradio_FIND_COMPONENTS)
-    include("${CMAKE_CURRENT_LIST_DIR}/gnuradio-${target}Config.cmake")
+  set(GR_COMPONENT_INCLUDE_FILE
+      "${CMAKE_CURRENT_LIST_DIR}/gnuradio-${target}Config.cmake")
+  if(${target} IN_LIST Gnuradio_FIND_COMPONENTS
+     AND (EXISTS ${GR_COMPONENT_INCLUDE_FILE}
+          OR "${Gnuradio_FIND_REQUIRED_${target}}"))
+    include(${GR_COMPONENT_INCLUDE_FILE})
   endif()
 endforeach(target)

cmake/Modules/GrTest.cmake

@@ -61,6 +61,10 @@ function(GR_ADD_TEST test_name)
     # Keep the original path conversion for pypath - the above commented line breaks CI tests
     file(TO_NATIVE_PATH "${GR_TEST_PYTHON_DIRS}" pypath) #ok to use on dir list?
 
+    # add test module directory to PYTHONPATH to allow CTest to find QA test modules.
+    # We add it to the beginning of the list to use locally-built modules before installed ones.
+    list(INSERT pypath 0 "${CMAKE_BINARY_DIR}/test_modules")
+
     set(environs "VOLK_GENERIC=1" "GR_DONT_LOAD_PREFS=1" "srcdir=${srcdir}"
         "GR_CONF_CONTROLPORT_ON=False")
     list(APPEND environs ${GR_TEST_ENVIRONS})

docs/doxygen/doxyxml/__init__.py

@@ -54,6 +54,7 @@
 
 from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther
 
+
 def _test():
     import os
     this_dir = os.path.dirname(globals()['__file__'])
@@ -65,6 +66,6 @@ def _test():
     import doctest
     return doctest.testmod()
 
+
 if __name__ == "__main__":
     _test()
-

docs/doxygen/doxyxml/base.py

@@ -83,8 +83,8 @@ def get_cls(self, mem):
         for cls in self.mem_classes:
             if cls.can_parse(mem):
                 return cls
-        raise Exception(("Did not find a class for object '%s'." \
-                                 % (mem.get_name())))
+        raise Exception(("Did not find a class for object '%s'."
+                         % (mem.get_name())))
 
     def convert_mem(self, mem):
         try: