numpv2 support.

.github/workflows/ci-test.yml

@@ -10,10 +10,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 1
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
@@ -44,21 +40,21 @@ jobs:
       - name: install gnuradio
         run: |
           sudo add-apt-repository ppa:gnuradio/gnuradio-releases && sudo apt-get update && \
-            sudo apt-get install -y --no-install-recommends gnuradio-dev python3-packaging
+            sudo apt-get install -y --no-install-recommends gnuradio-dev python3-packaging && \
+            sudo pip3 install -U pyserial requests numpy scipy && \
+            sudo dpkg -r --force-depends python3-numpy python3-requests python3-scipy
       - name: Install dependencies
         run: |
+          sudo $(which poetry) config virtualenvs.create false && \
+          sudo $(which poetry) install --no-interaction -C gamutrflib && \
+          sudo $(which poetry) install --no-interaction -C gamutrfwaterfall && \
+          sudo $(which poetry) install --no-interaction -C utils/mavlink-api && \
+          sudo $(which poetry) install --no-interaction && \
           for repodir in flatbuffers json libsigmf gr-iqtlabs ; do \
               mkdir -p ${repodir}/build && cd ${repodir}/build && \
               cmake -DUSE_SYSTEM_JSON=ON -DUSE_SYSTEM_FLATBUFFERS=ON .. && make -j "$(nproc)" && sudo make install && cd ../.. ; \
           done && \
-          sudo ldconfig -v && \
-          poetry config virtualenvs.create false && \
-          poetry install --no-interaction -C gamutrflib && \
-          poetry install --no-interaction -C gamutrfwaterfall && \
-          poetry install --no-interaction -C utils/mavlink-api && \
-          poetry install --no-interaction && \
-          sudo pip3 install -U pyserial requests && \
-          sudo dpkg -r --force-depends python3-numpy python3-requests
+          sudo ldconfig -v
       - name: Code Quality - yamllint
         run: |
           yamllint -s *yml
@@ -72,16 +68,12 @@ jobs:
         run: |
           poetry run pylint --fail-under=6 gamutrf/ gamutrflib/ gamutrfwaterfall/
       - name: Code Quality - Pytype
-        env:
-          PYTHONPATH: /usr/local/lib/python3.10/dist-packages:/usr/lib/python3/dist-packages
         run: |
           sudo pip3 install pytype=="$(grep -E "pytype = " pyproject.toml | grep -Eo "[0-9\.]+")" && \
             pytype -k gamutrf/ && \
             pytype -k gamutrflib/ && \
             pytype -k utils/mavlink-api
       - name: Test with pytest
-        env:
-          PYTHONPATH: /usr/local/lib/python3.10/dist-packages:/usr/lib/python3/dist-packages
         run: |
           ldconfig -p|grep iqtlabs
           poetry run pytest --cov-report term-missing --cov=. --cov-report=xml tests/ gamutrfwaterfall/tests

.github/workflows/docker-test.yml

@@ -33,7 +33,7 @@ jobs:
         docker build -f docker/Dockerfile.vkfft . -t iqtlabs/gamutrf-vkfft:latest
         docker build -f docker/Dockerfile.sigmf docker -t iqtlabs/gamutrf-sigmf:latest
         docker build -f docker/Dockerfile.driver docker -t iqtlabs/gamutrf-driver:latest
-        docker build -f docker/Dockerfile.base docker -t iqtlabs/gamutrf-base:latest
+        docker build -f docker/Dockerfile.base . -t iqtlabs/gamutrf-base:latest
         docker rmi -f iqtlabs/gamutrf-vkfft:latest iqtlabs/gamutrf-driver:latest
         docker build -f Dockerfile . -t iqtlabs/gamutrf:latest
         docker run -t iqtlabs/gamutrf:latest gamutrf-compress_dirs --help

.github/workflows/docker.yml

@@ -61,7 +61,7 @@ jobs:
     - name: Build and push platforms base
       uses: docker/build-push-action@v6
       with:
-        context: docker
+        context: .
         file: docker/Dockerfile.base
         platforms: linux/amd64,linux/arm64
         push: true

docker/Dockerfile.base

@@ -13,8 +13,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libuhd-dev \
   libvulkan-dev \
   pybind11-dev \
-  python3-numpy
+  python3-pip
+WORKDIR /root/.config/pip
+COPY pip.conf pip.conf
 WORKDIR /root
+COPY pyproject.toml /root/
+RUN pip3 install numpy=="$(grep -E "numpy = " pyproject.toml | grep -Eo "[0-9\.]+")"
 RUN git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.113
 COPY --from=iqtlabs/gamutrf-vkfft:latest /root /root/gr-iqtlabs
 WORKDIR /root/gr-iqtlabs/build
@@ -37,7 +41,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libunwind8 \
     libvulkan1 \
     python3 \
-    python3-numpy \
     && apt-get -y -q clean && rm -rf /var/lib/apt/lists/*
 COPY --from=iqtlabs/gnuradio:3.10.10.0 /usr/local /usr/local
 COPY --from=iqtlabs/gamutrf-driver /usr/local /usr/local