From: Ondrej Lichtner olichtne@redhat.com
There was an extra space indenting the patch more than it should have...
Signed-off-by: Ondrej Lichtner olichtne@redhat.com --- lnst/Recipes/ENRT/BondRecipe.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lnst/Recipes/ENRT/BondRecipe.py b/lnst/Recipes/ENRT/BondRecipe.py index 2611974..16b80e9 100644 --- a/lnst/Recipes/ENRT/BondRecipe.py +++ b/lnst/Recipes/ENRT/BondRecipe.py @@ -112,7 +112,7 @@ def parallel_stream_qdisc_hw_config_dev_list(self): return [self.matched.host1.eth0, self.matched.host1.eth1, self.matched.host2.eth0]
- @property - def no_pause_frames_dev_list(self): - return [self.matched.host1.eth0, self.matched.host1.eth1, - self.matched.host2.eth0] + @property + def no_pause_frames_dev_list(self): + return [self.matched.host1.eth0, self.matched.host1.eth1, + self.matched.host2.eth0]
From: Ondrej Lichtner olichtne@redhat.com
Depending on where the 'sphinx-build' is called from, the relative import path of '../'+sys.path didn't always work. This fixes the issue by defining the path as relative to location of the conf.py file.
Signed-off-by: Ondrej Lichtner olichtne@redhat.com --- docs/source/conf.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/docs/source/conf.py b/docs/source/conf.py index e8784ca..49d3c6b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -10,9 +10,15 @@ # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. # -# import os -# import sys -# sys.path.insert(0, os.path.abspath('.')) +import os +import sys +import pathlib +sys.path.insert( + 0, + os.path.abspath( + os.path.join(pathlib.Path(__file__).parent.absolute(), "../../") + ), +)
# -- Project information ----------------------------------------------------- @@ -31,9 +37,6 @@ 'sphinx.ext.autodoc', ]
-import sys -sys.path = ['../'] + sys.path - # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates']
On Thu, Apr 30, 2020 at 02:08:58PM +0200, olichtne@redhat.com wrote:
From: Ondrej Lichtner olichtne@redhat.com
There was an extra space indenting the patch more than it should have...
Signed-off-by: Ondrej Lichtner olichtne@redhat.com
lnst/Recipes/ENRT/BondRecipe.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lnst/Recipes/ENRT/BondRecipe.py b/lnst/Recipes/ENRT/BondRecipe.py index 2611974..16b80e9 100644 --- a/lnst/Recipes/ENRT/BondRecipe.py +++ b/lnst/Recipes/ENRT/BondRecipe.py @@ -112,7 +112,7 @@ def parallel_stream_qdisc_hw_config_dev_list(self): return [self.matched.host1.eth0, self.matched.host1.eth1, self.matched.host2.eth0]
@property
def no_pause_frames_dev_list(self):
return [self.matched.host1.eth0, self.matched.host1.eth1,
self.matched.host2.eth0]
- @property
- def no_pause_frames_dev_list(self):
return [self.matched.host1.eth0, self.matched.host1.eth1,
self.matched.host2.eth0]
-- 2.26.2
pushed both as well...
-Ondrej
lnst-developers@lists.fedorahosted.org