From 1e1417b6c14e8e3cd8a4e7de5197e347e9636b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= <carlossmocholi@gmail.com>
Date: Thu, 15 Dec 2022 21:43:52 +0100
Subject: [PATCH] Avoid --editable mode since it adds all src modules to the
 path

---
 .github/workflows/ci-app-examples.yml              |  5 +++--
 tests/tests_examples_app/conftest.py               | 10 +++++-----
 tests/tests_examples_app/public/__init__.py        |  4 +---
 tests/tests_examples_app/public/test_multi_node.py |  1 +
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-app-examples.yml b/.github/workflows/ci-app-examples.yml
index 2046cd940aafb3..e3f36521c0f0a5 100644
--- a/.github/workflows/ci-app-examples.yml
+++ b/.github/workflows/ci-app-examples.yml
@@ -86,10 +86,11 @@ jobs:
       - name: Install Yarn
         run: npm install -g yarn
 
-      - name: Install Lightning package
+      - name: Install package
         env:
           PACKAGE_NAME: ${{ matrix.pkg-name }}
-        run: pip install -e .
+        # do not use -e because it will make both packages available since it adds `src` to `sys.path` automatically
+        run: pip install .
 
       - name: Adjust tests
         if: ${{ matrix.pkg-name == 'lightning' }}
diff --git a/tests/tests_examples_app/conftest.py b/tests/tests_examples_app/conftest.py
index fcefa6287c3c6f..dccb33a0bd8285 100644
--- a/tests/tests_examples_app/conftest.py
+++ b/tests/tests_examples_app/conftest.py
@@ -5,8 +5,8 @@
 
 import psutil
 import pytest
+from tests_examples_app.public import _PATH_EXAMPLES
 
-from lightning_app import _PROJECT_ROOT
 from lightning_app.storage.path import _storage_root_dir
 from lightning_app.utilities.component import _set_context
 from lightning_app.utilities.packaging import cloud_compute
@@ -24,11 +24,11 @@ def pytest_sessionstart(*_):
     """Pytest hook that get called after the Session object has been created and before performing collection and
     entering the run test loop."""
     for name, url in GITHUB_APP_URLS.items():
-        if not os.path.exists(os.path.join(_PROJECT_ROOT, "examples", name)):
-            path_examples = os.path.join(_PROJECT_ROOT, "examples")
-            Popen(["git", "clone", url, name], cwd=path_examples).wait(timeout=90)
+        app_path = os.path.join(_PATH_EXAMPLES, name)
+        if not os.path.exists(app_path):
+            Popen(["git", "clone", url, name], cwd=_PATH_EXAMPLES).wait(timeout=90)
         else:
-            Popen(["git", "pull", "main"], cwd=os.path.join(_PROJECT_ROOT, "examples", name)).wait(timeout=90)
+            Popen(["git", "pull", "main"], cwd=app_path).wait(timeout=90)
 
 
 def pytest_sessionfinish(session, exitstatus):
diff --git a/tests/tests_examples_app/public/__init__.py b/tests/tests_examples_app/public/__init__.py
index b70149ce10b116..8a95a0a213d428 100644
--- a/tests/tests_examples_app/public/__init__.py
+++ b/tests/tests_examples_app/public/__init__.py
@@ -1,5 +1,3 @@
 import os
 
-from lightning_app import _PROJECT_ROOT
-
-_PATH_EXAMPLES = os.path.join(_PROJECT_ROOT, "examples")
+_PATH_EXAMPLES = os.path.abspath(os.path.join("..", "..", "..", "examples"))
diff --git a/tests/tests_examples_app/public/test_multi_node.py b/tests/tests_examples_app/public/test_multi_node.py
index 0eafa8a4922065..44233e89633ab1 100644
--- a/tests/tests_examples_app/public/test_multi_node.py
+++ b/tests/tests_examples_app/public/test_multi_node.py
@@ -18,6 +18,7 @@ def on_before_run_once(self):
         return res
 
 
+# for the skip to work, the package needs to be installed without editable mode
 _SKIP_LIGHTNING_UNAVAILABLE = pytest.mark.skipif(not package_available("lightning"), reason="script requires lightning")