From ec863a4f16ab57f39f29c0af6b917bcbd889a31b Mon Sep 17 00:00:00 2001 From: "Ian H. Pittwood" Date: Mon, 17 Jun 2019 09:14:37 -0500 Subject: [PATCH] Fix circular Spyglass dependency Adding PBR into spyglass-plugin-xls has caused a circular dependency. Because Spyglass installs spyglass-plugin-xls it also now tries to resolve spyglass-plugin-xls's requirements.txt which in turn requires Spyglass to be installed. Since Spyglass is what's currently trying to install, pip fails to resolve the plugin's dependencies. This change moves the Spyglass requirement into test-requirements.txt. Spyglass will always install this plugin so spyglass-plugin-xls should only need to install Spyglass to run its own independent tests. Change-Id: Ia5765d6b894cc1073c8be803d43f0b90cc448383 --- requirements.txt | 2 -- test-requirements.txt | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7031be5..0321add 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ click==7.0 PyYAML==5.1.1 openpyxl==2.6.2 - -git+https://opendev.org/airship/spyglass.git#egg=spyglass \ No newline at end of file diff --git a/test-requirements.txt b/test-requirements.txt index 51eeae2..b4c3e4b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,3 +6,6 @@ hacking==1.1.0 # Security bandit==1.6.0 + +# Installs Spyglass for independent tests, but not in requirements.txt since Spyglass will always install this plugin +git+https://opendev.org/airship/spyglass.git#egg=spyglass