From a006e61e86dfcea5cfcbb7bdd8910b4d371cd427 Mon Sep 17 00:00:00 2001
From: Brad Cowie <brad@faucet.nz>
Date: Thu, 5 Oct 2023 09:42:14 +1300
Subject: [PATCH] Install fakencclient for all python package installs.

---
 docker/install-faucet.sh               | 1 -
 requirements.txt                       | 1 +
 tests/unit/packaging/test_packaging.py | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/install-faucet.sh b/docker/install-faucet.sh
index 89df7354b4..5c76e706a3 100755
--- a/docker/install-faucet.sh
+++ b/docker/install-faucet.sh
@@ -11,7 +11,6 @@ FROOT="/faucet-src"
 dir=$(dirname "$0")
 
 ${APK} add -U ${BUILDDEPS}
-"${dir}/retrycmd.sh" "${PIP3} git+https://github.com/faucetsdn/python3-fakencclient"
 "${dir}/retrycmd.sh" "${PIP3} ${TESTDEPS}"
 "${dir}/retrycmd.sh" "${PIP3} -r ${FROOT}/requirements.txt"
 ${PIP3} ${FROOT}
diff --git a/requirements.txt b/requirements.txt
index 4daff48b1d..c86a133038 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,3 +7,4 @@ ruamel.yaml==0.17.26
 os_ken==2.6.0
 beka==0.4.2
 pytricia>=1.0.0
+https://github.com/faucetsdn/python3-fakencclient/archive/main.tar.gz
diff --git a/tests/unit/packaging/test_packaging.py b/tests/unit/packaging/test_packaging.py
index 6ec10f943c..963ac744eb 100755
--- a/tests/unit/packaging/test_packaging.py
+++ b/tests/unit/packaging/test_packaging.py
@@ -57,6 +57,8 @@ def _parse_pip_requirements(self, requirements_file):
         self.faucet_pip_reqs = {}
         with open(requirements_file, "r", encoding="utf-8") as handle:
             for pip_req in requirements.parse(handle):
+                if pip_req.name is None:
+                    continue
                 self.faucet_pip_reqs[pip_req.name] = pip_req.specs
 
     def _pip_req_to_dpkg_name(self, pip_req):