From f2fc564bf8e63798246eb75bf1801b779b39d490 Mon Sep 17 00:00:00 2001
From: Richard R <58728519+rrjbca@users.noreply.github.com>
Date: Fri, 14 May 2021 10:09:44 +0100
Subject: [PATCH] Infer context variables after handling explicit dependencies

---
 skypy/pipeline/_pipeline.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/skypy/pipeline/_pipeline.py b/skypy/pipeline/_pipeline.py
index 474ed1c1..84be0a6b 100644
--- a/skypy/pipeline/_pipeline.py
+++ b/skypy/pipeline/_pipeline.py
@@ -102,8 +102,6 @@ def __init__(self, configuration):
             self.dag.add_node(job, skip=False)
             if isinstance(settings, Item):
                 items[job] = settings
-                # infer additional item properties from context
-                settings.infer(context)
         for table, columns in self.table_config.items():
             table_complete = '.'.join((table, 'complete'))
             self.dag.add_node(table_complete)
@@ -115,8 +113,6 @@ def __init__(self, configuration):
                 self.dag.add_edge(job, table_complete)
                 if isinstance(settings, Item):
                     items[job] = settings
-                    # infer additional item properties from context
-                    settings.infer(context)
                 # DAG nodes for individual columns in multi-column assignment
                 names = [n.strip() for n in column.split(',')]
                 if len(names) > 1:
@@ -138,6 +134,8 @@ def __init__(self, configuration):
                 while c:
                     self.dag.add_edge(c, d)
                     c, d = c.rpartition('.')[0], c
+            # infer additional item properties from context
+            settings.infer(context)
 
     def execute(self, parameters={}):
         r'''Run a pipeline.