From aa792011da8a338a8138b0c8db3e0cf55d89324f Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Wed, 7 Sep 2022 11:56:38 +0300 Subject: [PATCH] [WIFI-10536] Fix: use tip_2x instead of the template for the setup Signed-off-by: Dmitry Dunaev --- docker/Dockerfile | 1 - dut_lib_template/setup.py | 2 +- setup_env.bash | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 67f6b4990..a789e1404 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,6 @@ COPY requirements.txt /wlan-testing/requirements.txt RUN pip3 install -r /wlan-testing/requirements.txt COPY tests /wlan-testing/tests COPY libs /wlan-testing/libs -COPY dut_lib_template /wlan-testing/dut_lib_template COPY setup_env.bash /wlan-testing/setup_env.bash ENV PYTHON=/usr/local/bin/python3 ENV PIP=/usr/local/bin/pip3 diff --git a/dut_lib_template/setup.py b/dut_lib_template/setup.py index ad343a547..a121d9d23 100644 --- a/dut_lib_template/setup.py +++ b/dut_lib_template/setup.py @@ -6,7 +6,7 @@ with open("README.md", "r") as fh: setuptools.setup( name='dut_lib_template', version='0.1', - scripts=['dut_lib_template.py', 'ap_lib.py', 'SetupLibrary.py', 'openwrt_ctl.py'], + scripts=['dut_lib_template.py', 'controller.py', 'ap_lib.py', 'SetupLibrary.py', 'openwrt_ctl.py'], author="Shivam Thakur", author_email="shivam.thakur@candelatech.com", description="TIP OpenWIFI 2.X Library", diff --git a/setup_env.bash b/setup_env.bash index dfef53733..0570f8daf 100755 --- a/setup_env.bash +++ b/setup_env.bash @@ -98,7 +98,7 @@ then cd libs/tip_2x $PYTHON setup.py bdist_wheel $PIP install dist/*.whl --force-reinstall - cd ../ + cd ../../ fi x=$(whoami) echo -e "\"\"\"\nRegistered Target Imports\n\"\"\"\nimport sys\nimport importlib\n\nsys.path.append('/usr/local/bin')\n\nsys.path.append('/home/$x/.local//bin/')\n\nsys.path.append('/home/$x/.local/lib/python3.8/site-packages/')\n\n" >> tests/imports.py