rename integrations (#16312)

Borda · pre-commit-ci[bot] · web-flow · commit 669ecff91502 · 2023-01-10T13:52:01.000+01:00
* rename integrations * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * name * Artifact Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
diff --git a/.azure/app-cloud-e2e.yml b/.azure/app-cloud-e2e.yml
@@ -31,7 +31,7 @@ pr:
       - ".azure/app-cloud-e2e.yml"
       - "src/lightning_app/**"
       - "requirements/app/**"
-      - "tests/tests_examples_app/**"
+      - "tests/integrations_app_examples/**"
       - "setup.py"
     exclude:
       - "requirements/*/docs.txt"
@@ -48,8 +48,8 @@ variables:
     value: ./videos
 
 jobs:
-  - job: App_cloud_e2e_testing
-    pool: azure-cpus
+  - job: App_e2e_cloud
+    pool: "azure-cpus"
     container:
       image: mcr.microsoft.com/playwright/python:v1.28.0-focal
       options: "--shm-size=4gb"
@@ -98,6 +98,17 @@ jobs:
     # values: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#workspace
     workspace:
       clean: all
+    variables:
+      HEADLESS: '1'
+      PACKAGE_LIGHTNING: '1'
+      CLOUD: '1'
+      VIDEO_LOCATION: $(video_artifact_dir)
+      PR_NUMBER: $(local_id)
+      TEST_APP_NAME: $(name)
+      TEST_APP_FOLDER: $(dir)
+      HAR_LOCATION: './artifacts/hars'
+      SLOW_MO: '50'
+      LIGHTNING_DEBUG: '1'
     steps:
 
     - script: echo '##vso[task.setvariable variable=local_id]$(System.PullRequest.PullRequestNumber)'
@@ -134,13 +145,6 @@ jobs:
       condition: eq(variables['name'], 'quick_start')
       displayName: 'Clone Quick start Repo'
 
-    # - bash: |
-    #     rm -rf examples/app_template_jupyterlab || true
-    #     git clone https://github.com/Lightning-AI/LAI-lightning-template-jupyterlab-App examples/app_template_jupyterlab
-    #     cp examples/app_template_jupyterlab/tests/test_template_jupyterlab.py tests/tests_examples_app/test_template_jupyterlab.py
-    #   condition: eq(variables['name'], 'template_jupyterlab')
-    #   displayName: 'Clone Template Jupyter Lab Repo'
-
     - bash: |
         rm -rf examples/app_template_react_ui || true
         git clone https://github.com/Lightning-AI/lightning-template-react examples/app_template_react_ui
@@ -163,35 +167,25 @@ jobs:
       displayName: 'List pip dependency'
 
     - bash: |
-        mkdir -p ${VIDEO_LOCATION}
         ls -l examples/${TEST_APP_NAME}
-        ls -l tests/tests_examples_app/public
-        python -m pytest tests/tests_examples_app/${TEST_APP_FOLDER}/test_${TEST_APP_NAME}.py::test_${TEST_APP_NAME}_example_cloud \
+        python -m pytest ${TEST_FILE}::test_${TEST_APP_NAME}_example_cloud \
           --timeout=540 --capture=no -v --color=yes
       env:
-        HEADLESS: '1'
-        PACKAGE_LIGHTNING: '1'
-        CLOUD: '1'
-        VIDEO_LOCATION: $(video_artifact_dir)
-        PR_NUMBER: $(local_id)
-        TEST_APP_NAME: $(name)
-        TEST_APP_FOLDER: $(dir)
-        HAR_LOCATION: './artifacts/hars'
-        SLOW_MO: '50'
+        TEST_FILE: tests/integrations_app_examples/$(TEST_APP_FOLDER)/test_$(TEST_APP_NAME).py
         #LAI_USER: $(LAI_USER)  # for STAGING
         #LAI_PASS: $(LAI_PASS)  # for STAGING
         LIGHTNING_USER_ID: $(LIGHTNING_USER_ID_PROD)
         LIGHTNING_API_KEY: $(LIGHTNING_API_KEY_PROD)
         LIGHTNING_USERNAME: $(LIGHTNING_USERNAME)
         LIGHTNING_CLOUD_URL: $(LIGHTNING_CLOUD_URL_PROD)
-        LIGHTNING_DEBUG: '1'
       displayName: 'Run the tests'
 
     - task: PublishPipelineArtifact@1
       condition: failed()
       inputs:
-        path: $(video_artifact_dir)
+        path: "$(video_artifact_dir)/$(name)"
         artifactName: $(name)
+        publishLocation: 'pipeline'
       displayName: 'Publish videos'
 
     - bash: |
@@ -204,11 +198,5 @@ jobs:
         LIGHTNING_API_KEY: $(LIGHTNING_API_KEY_PROD)
         LIGHTNING_USERNAME: $(LIGHTNING_USERNAME)
         LIGHTNING_CLOUD_URL: $(LIGHTNING_CLOUD_URL_PROD)
-        PR_NUMBER: $(local_id)
-        TEST_APP_NAME: $(name)
-        TEST_APP_FOLDER: $(dir)
-        # GRID_USER_ID: $(LIGHTNING_USER_ID)  # TODO: clarify the meaning
-        # GRID_USER_KEY: $(LIGHTNING_API_KEY)  # TODO: clarify the meaning
-        # GRID_URL: $(LIGHTNING_CLOUD_URL)
-        # _GRID_USERNAME: $(LIGHTNING_USERNAME)
+      timeoutInMinutes: "3"
       displayName: 'Clean Previous Apps'
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -45,7 +45,7 @@
 # Lightning App
 /src/lightning_app                          @tchaton @lantiga @awaelchli @hhsecond @ethanwharris
 /tests/tests_app                            @tchaton @lantiga @awaelchli @hhsecond @ethanwharris
-/tests/tests_examples_app                   @tchaton @lantiga @awaelchli @hhsecond @ethanwharris
+/tests/integrations_app_examples            @tchaton @lantiga @awaelchli @hhsecond @ethanwharris
 /examples/app_*                             @tchaton @lantiga @awaelchli @hhsecond @ethanwharris
 
 /.github/CODEOWNERS                  @williamfalcon
diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml
@@ -247,7 +247,7 @@ subprojects:
       - ".actions/**"
       - ".github/workflows/ci-examples-app.yml"
       - "src/lightning_app/**"
-      - "tests/tests_examples_app/**"
+      - "tests/integrations_app_examples/**"
       - "examples/app_*/**"
       - "requirements/app/**"
       - "setup.py"
@@ -271,7 +271,7 @@ subprojects:
       - ".azure/app-cloud-e2e.yml"
       - "src/lightning_app/**"
       - "requirements/app/**"
-      - "tests/tests_examples_app/**"
+      - "tests/integrations_app_examples/**"
       - "setup.py"
       - "!requirements/*/docs.txt"
       - "!*.md"
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -5,7 +5,7 @@ app:
   all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
 - any: ['tests/tests_app/**/*']
   all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
-- any: ['tests/tests_examples_app/**/*']
+- any: ['tests/integrations_app_examples/**/*']
   all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
 - any: ['examples/app_*/**/*']
   all: ['!src/pytorch_lightning/**/*', '!tests/tests_pytorch/**/*', '!docs/source-pytorch/**/*', '!requirements/pytorch/*']
@@ -16,12 +16,12 @@ app:
 
 pl:
 - any: ['src/pytorch_lightning/**/*']
-  all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/tests_examples_app/**/*', '!docs/source-app/**/*', '!requirements/app/*']
+  all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/integrations_app_examples/**/*', '!docs/source-app/**/*', '!requirements/app/*']
 - any: ['examples/*pl_*/**/*']
-  all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/tests_examples_app/**/*', '!docs/source-app/**/*', '!requirements/app/*']
+  all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/integrations_app_examples/**/*', '!docs/source-app/**/*', '!requirements/app/*']
 - any: ['tests/tests_pytorch/**/*']
-  all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/tests_examples_app/**/*', '!docs/source-app/**/*', '!requirements/app/*']
+  all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/integrations_app_examples/**/*', '!docs/source-app/**/*', '!requirements/app/*']
 - any: ['docs/source-pytorch/**/*']
-  all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/tests_examples_app/**/*', '!docs/source-app/**/*', '!requirements/app/*']
+  all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/integrations_app_examples/**/*', '!docs/source-app/**/*', '!requirements/app/*']
 - any: ['requirements/pytorch/*']
-  all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/tests_examples_app/**/*', '!docs/source-app/**/*', '!requirements/app/*']
+  all: ['!src/lightning/**/*', '!src/lightning_app/**/*', '!tests/tests_app/**/*', '!tests/integrations_app_examples/**/*', '!docs/source-app/**/*', '!requirements/app/*']
diff --git a/.github/workflows/ci-examples-app.yml b/.github/workflows/ci-examples-app.yml
@@ -11,7 +11,7 @@ on:
       - ".actions/**"
       - ".github/workflows/ci-examples-app.yml"
       - "src/lightning_app/**"
-      - "tests/tests_examples_app/**"
+      - "tests/integrations_app_examples/**"
       - "examples/app_*/**"
       - "requirements/app/**"
       - "setup.py"
@@ -114,7 +114,7 @@ jobs:
           PYTEST_ARTIFACT: results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml
         run: |
           python -m coverage run --source ${COVERAGE_SCOPE} \
-            -m pytest -m "not cloud" tests_examples_app \
+            -m pytest -m "not cloud" integrations_app_examples \
             --timeout=300 --durations=0 -vvvv \
             --junitxml=$PYTEST_ARTIFACT
 
diff --git a/tests/integrations_app_examples/__init__.py b/tests/integrations_app_examples/__init__.py
diff --git a/tests/integrations_app_examples/apps/collect_failures/__init__.py b/tests/integrations_app_examples/apps/collect_failures/__init__.py
diff --git a/tests/integrations_app_examples/apps/collect_failures/app.py b/tests/integrations_app_examples/apps/collect_failures/app.py
diff --git a/tests/integrations_app_examples/apps/collect_failures/requirements.txt b/tests/integrations_app_examples/apps/collect_failures/requirements.txt
diff --git a/tests/integrations_app_examples/apps/core_features_app/__init__.py b/tests/integrations_app_examples/apps/core_features_app/__init__.py
diff --git a/tests/integrations_app_examples/apps/core_features_app/app.py b/tests/integrations_app_examples/apps/core_features_app/app.py
@@ -8,7 +8,7 @@ def __init__(self):
         super().__init__()
 
     def run(self):
-        # these env vars are set here: tests/tests_examples_app/test_core_features_app.py:15
+        # these env vars are set here: tests/integrations_app_examples/test_core_features_app.py:15
         assert os.getenv("FOO", "") == "bar"
         assert os.getenv("BLA", "") == "bloz"
         self._exit()
diff --git a/tests/integrations_app_examples/apps/custom_work_dependencies/__init__.py b/tests/integrations_app_examples/apps/custom_work_dependencies/__init__.py
diff --git a/tests/integrations_app_examples/apps/custom_work_dependencies/app.py b/tests/integrations_app_examples/apps/custom_work_dependencies/app.py
diff --git a/tests/integrations_app_examples/apps/idle_timeout/__init__.py b/tests/integrations_app_examples/apps/idle_timeout/__init__.py
diff --git a/tests/integrations_app_examples/apps/idle_timeout/app.py b/tests/integrations_app_examples/apps/idle_timeout/app.py
diff --git a/tests/integrations_app_examples/conftest.py b/tests/integrations_app_examples/conftest.py
@@ -5,7 +5,7 @@
 
 import psutil
 import pytest
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.storage.path import _storage_root_dir
 from lightning_app.utilities.component import _set_context
diff --git a/tests/integrations_app_examples/local/__init__.py b/tests/integrations_app_examples/local/__init__.py
diff --git a/tests/integrations_app_examples/local/test_collect_failures.py b/tests/integrations_app_examples/local/test_collect_failures.py
@@ -2,7 +2,7 @@
 from time import sleep
 
 import pytest
-from tests_examples_app.local import _PATH_APPS
+from integrations_app_examples.local import _PATH_APPS
 
 from lightning_app.testing.testing import run_app_in_cloud
 
diff --git a/tests/integrations_app_examples/local/test_core_features_app.py b/tests/integrations_app_examples/local/test_core_features_app.py
@@ -1,7 +1,7 @@
 import os
 
 from click.testing import CliRunner
-from tests_examples_app.local import _PATH_APPS
+from integrations_app_examples.local import _PATH_APPS
 
 from lightning_app.cli.lightning_cli import run_app
 
diff --git a/tests/integrations_app_examples/local/test_custom_work_dependencies.py b/tests/integrations_app_examples/local/test_custom_work_dependencies.py
@@ -2,7 +2,7 @@
 from time import sleep
 
 import pytest
-from tests_examples_app.local import _PATH_APPS
+from integrations_app_examples.local import _PATH_APPS
 
 from lightning_app.testing.testing import run_app_in_cloud
 
diff --git a/tests/integrations_app_examples/local/test_idle_timeout.py b/tests/integrations_app_examples/local/test_idle_timeout.py
@@ -2,7 +2,7 @@
 from time import sleep
 
 import pytest
-from tests_examples_app.local import _PATH_APPS
+from integrations_app_examples.local import _PATH_APPS
 
 from lightning_app.testing.testing import run_app_in_cloud
 
diff --git a/tests/integrations_app_examples/public/__init__.py b/tests/integrations_app_examples/public/__init__.py
diff --git a/tests/integrations_app_examples/public/test_app_dag.py b/tests/integrations_app_examples/public/test_app_dag.py
@@ -2,7 +2,7 @@
 from time import sleep
 
 import pytest
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.testing.testing import run_app_in_cloud
 
diff --git a/tests/integrations_app_examples/public/test_argparse.py b/tests/integrations_app_examples/public/test_argparse.py
@@ -1,7 +1,7 @@
 import os
 import sys
 
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.testing.testing import application_testing
 from lightning_app.utilities.load_app import _patch_sys_argv
diff --git a/tests/integrations_app_examples/public/test_boring_app.py b/tests/integrations_app_examples/public/test_boring_app.py
@@ -2,7 +2,7 @@
 
 import pytest
 from click.testing import CliRunner
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.cli.lightning_cli import show
 from lightning_app.testing.testing import run_app_in_cloud, wait_for
diff --git a/tests/integrations_app_examples/public/test_commands_and_api.py b/tests/integrations_app_examples/public/test_commands_and_api.py
@@ -4,7 +4,7 @@
 
 import pytest
 import requests
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.testing.testing import run_app_in_cloud
 from lightning_app.utilities.cloud import _get_project
diff --git a/tests/integrations_app_examples/public/test_drive.py b/tests/integrations_app_examples/public/test_drive.py
@@ -2,7 +2,7 @@
 from time import sleep
 
 import pytest
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.testing.testing import run_app_in_cloud
 
diff --git a/tests/integrations_app_examples/public/test_gradio.py b/tests/integrations_app_examples/public/test_gradio.py
diff --git a/tests/integrations_app_examples/public/test_installation_commands_app.py b/tests/integrations_app_examples/public/test_installation_commands_app.py
@@ -1,7 +1,7 @@
 import os
 
 import pytest
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.testing.testing import run_app_in_cloud
 
diff --git a/tests/integrations_app_examples/public/test_layout.py b/tests/integrations_app_examples/public/test_layout.py
@@ -1,7 +1,7 @@
 import os
 
 from click.testing import CliRunner
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.cli.lightning_cli import run_app
 
diff --git a/tests/integrations_app_examples/public/test_multi_node.py b/tests/integrations_app_examples/public/test_multi_node.py
@@ -2,8 +2,8 @@
 from unittest import mock
 
 import pytest
+from integrations_app_examples.public import _PATH_EXAMPLES
 from lightning_utilities.core.imports import package_available
-from tests_examples_app.public import _PATH_EXAMPLES
 
 from lightning_app.testing.helpers import _RunIf
 from lightning_app.testing.testing import application_testing, LightningTestApp
diff --git a/tests/integrations_app_examples/public/test_payload.py b/tests/integrations_app_examples/public/test_payload.py
@@ -2,7 +2,7 @@
 from time import sleep
 
 import pytest
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.testing.testing import run_app_in_cloud
 
diff --git a/tests/integrations_app_examples/public/test_pickle_or_not.py b/tests/integrations_app_examples/public/test_pickle_or_not.py
@@ -2,7 +2,7 @@
 
 import pytest
 from click.testing import CliRunner
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.cli.lightning_cli import run_app
 
diff --git a/tests/integrations_app_examples/public/test_quick_start.py b/tests/integrations_app_examples/public/test_quick_start.py
@@ -4,7 +4,7 @@
 
 import pytest
 from click.testing import CliRunner
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app import LightningApp
 from lightning_app.cli.lightning_cli import run_app
diff --git a/tests/integrations_app_examples/public/test_scripts.py b/tests/integrations_app_examples/public/test_scripts.py
@@ -2,7 +2,7 @@
 
 import pytest
 from click.testing import CliRunner
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.cli.lightning_cli import run_app
 from lightning_app.testing.helpers import _run_script, _RunIf
diff --git a/tests/integrations_app_examples/public/test_template_react_ui.py b/tests/integrations_app_examples/public/test_template_react_ui.py
@@ -2,7 +2,7 @@
 from time import sleep
 
 import pytest
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.testing.testing import run_app_in_cloud, wait_for
 
diff --git a/tests/integrations_app_examples/public/test_template_streamlit_ui.py b/tests/integrations_app_examples/public/test_template_streamlit_ui.py
@@ -2,7 +2,7 @@
 from time import sleep
 
 import pytest
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app.testing.testing import run_app_in_cloud, wait_for
 
diff --git a/tests/integrations_app_examples/public/test_v0_app.py b/tests/integrations_app_examples/public/test_v0_app.py
@@ -5,7 +5,7 @@
 from unittest.mock import MagicMock
 
 import pytest
-from tests_examples_app.public import _PATH_EXAMPLES
+from integrations_app_examples.public import _PATH_EXAMPLES
 
 from lightning_app import LightningApp
 from lightning_app.runners import CloudRuntime
