Force load_dotenv to use cwd, and move to before the checks

Author: robtaylor

chipflow_lib/steps/silicon.py

@@ -65,6 +65,7 @@ def build_cli_parser(self, parser):
 
     def run_cli(self, args):
         if args.action == "submit" and not args.dry_run:
+            dotenv.load_dotenv(dotenv_path=dotenv.find_dotenv(usecwd=True))
             if self.project_name is None:
                 raise ChipFlowError(
                     "Key `chipflow.project_id` is not defined in chipflow.toml; "
@@ -89,7 +90,6 @@ def prepare(self):
     def submit(self, rtlil_path, *, dry_run=False):
         """Submit the design to the ChipFlow cloud builder.
         """
-        dotenv.load_dotenv()
         git_head = subprocess.check_output(
             ["git", "-C", os.environ["CHIPFLOW_ROOT"],
              "rev-parse", "HEAD"],

tests/test_silicon_step.py

@@ -41,9 +41,8 @@ def setUp(self):
         os.environ["CHIPFLOW_API_KEY_ID"] = "keyid"
         os.environ["CHIPFLOW_API_KEY_SECRET"] = "keysecret"
 
-    @patch('dotenv.load_dotenv')
     @patch('requests.post', side_effect=mocked_requests_post)
-    def test_submit_happy_path(self, mock_requests_post, mock_dotenv):
+    def test_submit_happy_path(self, mock_requests_post):
         customer_config = f"{current_dir}/fixtures/mock.toml"
         with open(customer_config, "rb") as f:
             config_dict = tomli.load(f)
@@ -87,5 +86,3 @@ def test_submit_happy_path(self, mock_requests_post, mock_dotenv):
             }
         }
         assert rtlil == b"fake-rtlil", "The RTL file was passed through."
-
-        assert mock_dotenv.called