From f55c6ab5549473d97440d85f606e33e623fd4ba8 Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Thu, 26 Oct 2023 15:15:58 +1300 Subject: [PATCH 1/2] Prevent override deps from becoming part of python package. --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 53a5597905..7e8d0a3671 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -eventlet @ https://github.com/faucetsdn/eventlet/archive/main.tar.gz#egg=eventlet -ncclient @ https://github.com/faucetsdn/python3-fakencclient/archive/main.tar.gz#egg=ncclient +https://github.com/faucetsdn/eventlet/archive/main.tar.gz#egg=eventlet +https://github.com/faucetsdn/python3-fakencclient/archive/main.tar.gz#egg=ncclient chewie==0.0.25 influxdb>=2.12.0 networkx>=1.9 From 6abd28a873bb0f145161909c332c504f491e6367 Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Thu, 26 Oct 2023 16:25:18 +1300 Subject: [PATCH 2/2] Requirements specified by URI don't need a debian/control entry. --- tests/unit/packaging/test_packaging.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/packaging/test_packaging.py b/tests/unit/packaging/test_packaging.py index 15ceb663e5..96212b6f90 100755 --- a/tests/unit/packaging/test_packaging.py +++ b/tests/unit/packaging/test_packaging.py @@ -57,7 +57,7 @@ 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 or pip_req.local_file: + if pip_req.name is None or pip_req.local_file or pip_req.uri: continue self.faucet_pip_reqs[pip_req.name] = pip_req.specs