Change in gr-gsm[master]: travis: Add /usr/local/lib/python3/dist-packages/ to PYTHONPATH

[ptrkrysik]

Hello vvvelichkov,

I'd like you to do a code review. Please visit

    https://gerrit.osmocom.org/c/gr-gsm/+/24078

to review the following change.


Change subject: travis: Add /usr/local/lib/python3/dist-packages/ to PYTHONPATH
......................................................................

travis: Add /usr/local/lib/python3/dist-packages/ to PYTHONPATH

and run ldconfig after installing gr-iqbal and gr-osmosdr.

Due to debian-python-install patch [1] the OOT packages are installed in
/usr/local/lib/python3/dist-packages but this path is not in the python3
default search paths (sys.path) and because of this importing OOT
modules fails.

[1] https://salsa.debian.org/bottoms/pkg-gnuradio/blob/25e1de07/debian/patches/debian-python-install

Change-Id: I260c82d1a53dab85f7aac86f23e61309d8841255
---
M tests/dockerfiles/Debian_testing.docker
M tests/dockerfiles/Kali.docker
2 files changed, 10 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/78/24078/1

diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker
index 7fb7760..c482c52 100644
--- a/tests/dockerfiles/Debian_testing.docker
+++ b/tests/dockerfiles/Debian_testing.docker
@@ -26,19 +26,21 @@
     mkdir build && \
     cd build && \
     cmake .. && \
-    make -j $(nproc) install
+    make -j $(nproc) install && \
+    ldconfig
 
 RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \
     cd gr-osmosdr && \
     mkdir build && \
     cd build && \
     cmake .. && \
-    make -j $(nproc) install
+    make -j $(nproc) install && \
+    ldconfig
 
 RUN mkdir /src/build
 WORKDIR /src/build
 
-RUN cmake .. && \
+RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \
     # The parallel build sometimes fails when the .grc_gnuradio
     # and .gnuradio directories do not exist
     mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \
diff --git a/tests/dockerfiles/Kali.docker b/tests/dockerfiles/Kali.docker
index 8b03930..8949bb5 100644
--- a/tests/dockerfiles/Kali.docker
+++ b/tests/dockerfiles/Kali.docker
@@ -26,18 +26,20 @@
     mkdir build && \
     cd build && \
     cmake .. && \
-    make -j $(nproc) install
+    make -j $(nproc) install && \
+    ldconfig
 
 RUN git clone --branch maint-3.8 https://github.com/velichkov/gr-osmosdr && \
     cd gr-osmosdr && \
     mkdir build && \
     cd build && \
     cmake .. && \
-    make -j $(nproc) install
+    make -j $(nproc) install && \
+    ldconfig
 
 RUN mkdir /src/build
 WORKDIR /src/build
-RUN cmake .. && \
+RUN PYTHONPATH=/usr/local/lib/python3/dist-packages/:$PYTHONPATH cmake .. && \
     # The parallel build sometimes fails when the .grc_gnuradio
     # and .gnuradio directories do not exist
     mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \

-- 
To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24078
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-Change-Id: I260c82d1a53dab85f7aac86f23e61309d8841255
Gerrit-Change-Number: 24078
Gerrit-PatchSet: 1
Gerrit-Owner: ptrkrysik <ptrkrysik at gmail.com>
Gerrit-Reviewer: vvvelichkov <vvvelichkov at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210503/751c0cea/attachment.htm>