From 0fcd1400c3da08961fbecc4e303b32ae75c6346a Mon Sep 17 00:00:00 2001 From: "Travis F. Collins" Date: Tue, 28 Nov 2023 08:29:47 -0700 Subject: [PATCH] Update CI to use libiio-v1. Disable Windows conda builds for now Signed-off-by: Travis F. Collins --- .github/scripts/install_libiio.sh | 15 ++++++++++++++- .github/scripts/install_part_libs.sh | 8 +++++--- .github/scripts/install_pydeps.sh | 2 +- .github/workflows/win-test.yml | 3 ++- requirements.txt | 2 +- requirements_dev.txt | 2 +- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.github/scripts/install_libiio.sh b/.github/scripts/install_libiio.sh index c4b0123f3..18b2cc1a8 100755 --- a/.github/scripts/install_libiio.sh +++ b/.github/scripts/install_libiio.sh @@ -1,9 +1,22 @@ #!/bin/bash sudo apt-get -qq update sudo apt-get install -y git cmake graphviz libavahi-common-dev libavahi-client-dev libaio-dev libusb-1.0-0-dev libxml2-dev rpm tar bzip2 gzip flex bison git -git clone -b 'v0.25' --single-branch --depth 1 https://github.com/analogdevicesinc/libiio.git +git clone -b 'main' --single-branch --depth 1 https://github.com/analogdevicesinc/libiio.git cd libiio cmake . -DHAVE_DNS_SD=OFF make sudo make install cd .. +rm -rf libiio + +# Python pieces +sudo apt-get install -y python3-pip python3-setuptools +git clone -b 'main' --single-branch --depth 1 https://github.com/analogdevicesinc/libiio.git +cd libiio +cmake . -DHAVE_DNS_SD=OFF -DPYTHON_BINDINGS=ON +make +cd bindings/python +pip install . +cd ../.. +cd .. +rm -rf libiio diff --git a/.github/scripts/install_part_libs.sh b/.github/scripts/install_part_libs.sh index 5109bb93a..82df7d733 100755 --- a/.github/scripts/install_part_libs.sh +++ b/.github/scripts/install_part_libs.sh @@ -1,7 +1,9 @@ #!/bin/bash +exit 0 + git clone -b 'master' --single-branch --depth 1 https://github.com/analogdevicesinc/libad9361-iio.git cd libad9361-iio -cmake -DPYTHON_BINDINGS=ON . +cmake -DPYTHON_BINDINGS=ON -DLIBIIO_INCLUDEDIR=/usr/include/iio . make cd bindings/python pip install . @@ -13,7 +15,7 @@ rm -rf libad9361-iio git clone -b 'master' --single-branch --depth 1 https://github.com/analogdevicesinc/libad9166-iio.git cd libad9166-iio -cmake -DPYTHON_BINDINGS=ON . +cmake -DPYTHON_BINDINGS=ON -DLIBIIO_INCLUDEDIR=/usr/include/iio . make cd bindings/python pip install . @@ -23,4 +25,4 @@ sudo ldconfig cd .. rm -rf libad9166-iio -pip install pylibiio==0.23.1 +# pip install pylibiio==0.23.1 diff --git a/.github/scripts/install_pydeps.sh b/.github/scripts/install_pydeps.sh index 64849051c..93351f065 100644 --- a/.github/scripts/install_pydeps.sh +++ b/.github/scripts/install_pydeps.sh @@ -2,4 +2,4 @@ sudo apt-get install -y python3-pip python3-setuptools pip install -r requirements.txt pip install -r requirements_dev.txt -pip install pylibiio +# pip install pylibiio diff --git a/.github/workflows/win-test.yml b/.github/workflows/win-test.yml index ff4d3f8bf..3441ce59c 100644 --- a/.github/workflows/win-test.yml +++ b/.github/workflows/win-test.yml @@ -1,6 +1,7 @@ name: Windows Tests -on: [push, pull_request] +# on: [push, pull_request] +on: [pull_request] jobs: CondaBased: diff --git a/requirements.txt b/requirements.txt index 1e46aa48a..0940b6f53 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ numpy>=1.20 -pylibiio==0.23.1 +pylibiio>=1.0 paramiko diff --git a/requirements_dev.txt b/requirements_dev.txt index 5b14a23b7..f6a684d50 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -8,7 +8,7 @@ scapy scipy pytest-cov coveralls -pytest-libiio==0.0.13 +pytest-libiio@git+https://github.com/tfcollins/pytest-libiio.git@libiio-v1-support bump2version pytest-html plotly-express