Use dynamic version of py-shiny for deploy tests

.github/workflows/pytest.yaml

@@ -119,7 +119,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Run example app tests
+      - name: Run tests for deploys
         env:
           DEPLOY_CONNECT_SERVER_URL: "https://rsc.radixu.com/"
           DEPLOY_CONNECT_SERVER_API_KEY: "${{ secrets.DEPLOY_CONNECT_SERVER_API_KEY }}"

tests/playwright/deploys/apps/plotly_app/requirements.txt

@@ -1,5 +1,4 @@
 pandas
 plotly
-git+https://github.com/posit-dev/py-shiny.git#egg=shiny
 git+https://github.com/posit-dev/py-htmltools.git#egg=htmltools
 git+https://github.com/posit-dev/py-shinywidgets.git#egg=shinywidgets

tests/playwright/deploys/apps/shiny-express-accordion/requirements.txt

@@ -1,2 +1 @@
-git+https://github.com/posit-dev/py-shiny
 git+https://github.com/posit-dev/py-htmltools.git#egg=htmltools

tests/playwright/deploys/apps/shiny-express-dataframe/requirements.txt

@@ -1,3 +1,2 @@
-git+https://github.com/posit-dev/py-shiny
 git+https://github.com/posit-dev/py-htmltools.git#egg=htmltools
 pandas

tests/playwright/deploys/apps/shiny-express-folium/requirements.txt

@@ -1,3 +1,2 @@
-git+https://github.com/posit-dev/py-shiny
 git+https://github.com/posit-dev/py-htmltools.git#egg=htmltools
 folium

tests/playwright/deploys/apps/shiny-express-page-default/requirements.txt

@@ -1,2 +1 @@
-git+https://github.com/posit-dev/py-shiny
 git+https://github.com/posit-dev/py-htmltools.git#egg=htmltools

tests/playwright/deploys/apps/shiny-express-page-fillable/requirements.txt

@@ -1,2 +1 @@
-git+https://github.com/posit-dev/py-shiny
 git+https://github.com/posit-dev/py-htmltools.git#egg=htmltools

tests/playwright/deploys/apps/shiny-express-page-fluid/requirements.txt

@@ -1,2 +1 @@
-git+https://github.com/posit-dev/py-shiny
 git+https://github.com/posit-dev/py-htmltools.git#egg=htmltools

tests/playwright/deploys/apps/shiny-express-page-sidebar/requirements.txt

@@ -1,2 +1 @@
-git+https://github.com/posit-dev/py-shiny
 git+https://github.com/posit-dev/py-htmltools.git#egg=htmltools

tests/playwright/deploys/tests/test_accordion.py

@@ -2,7 +2,7 @@
 
 import pytest
 from playwright.sync_api import Page
-from utils.deploy_utils import deploy
+from utils.deploy_utils import deploy, tweak_requirements_txt
 from utils.express_utils import verify_express_accordion
 
 APP_DIR = "shiny-express-accordion"
@@ -17,6 +17,7 @@
 @pytest.mark.only_browser("chromium")
 @pytest.mark.parametrize("location", ["connect", "shinyapps"])
 def test_express_accordion(page: Page, location: str) -> None:
+    tweak_requirements_txt(app_file_path)
     page_url = deploy(location, APP_NAME, app_file_path)
     page.goto(page_url, timeout=PAGE_TIMEOUT)
     verify_express_accordion(page)

tests/playwright/deploys/tests/test_dataframe.py

@@ -2,7 +2,7 @@
 
 import pytest
 from playwright.sync_api import Page
-from utils.deploy_utils import deploy
+from utils.deploy_utils import deploy, tweak_requirements_txt
 from utils.express_utils import verify_express_dataframe
 
 APP_DIR = "shiny-express-dataframe"
@@ -17,6 +17,7 @@
 @pytest.mark.only_browser("chromium")
 @pytest.mark.parametrize("location", ["connect", "shinyapps"])
 def test_express_dataframe(page: Page, location: str) -> None:
+    tweak_requirements_txt(app_file_path)
     page_url = deploy(location, APP_NAME, app_file_path)
     page.goto(page_url, timeout=PAGE_TIMEOUT)
     verify_express_dataframe(page)

tests/playwright/deploys/tests/test_folium.py

@@ -2,7 +2,7 @@
 
 import pytest
 from playwright.sync_api import Page
-from utils.deploy_utils import deploy
+from utils.deploy_utils import deploy, tweak_requirements_txt
 from utils.express_utils import verify_express_folium_render
 
 APP_DIR = "shiny-express-folium"
@@ -17,6 +17,7 @@
 @pytest.mark.only_browser("chromium")
 @pytest.mark.parametrize("location", ["connect", "shinyapps"])
 def test_folium_map(page: Page, location: str) -> None:
+    tweak_requirements_txt(app_file_path)
     page_url = deploy(location, APP_NAME, app_file_path)
     page.goto(page_url, timeout=PAGE_TIMEOUT)
     verify_express_folium_render(page)

tests/playwright/deploys/tests/test_page_default.py

@@ -2,7 +2,7 @@
 
 import pytest
 from playwright.sync_api import Page
-from utils.deploy_utils import deploy
+from utils.deploy_utils import deploy, tweak_requirements_txt
 from utils.express_utils import verify_express_page_default
 
 APP_DIR = "shiny-express-page-default"
@@ -20,6 +20,7 @@
 @pytest.mark.only_browser("chromium")
 @pytest.mark.parametrize("location", ["connect", "shinyapps"])
 def test_express_page_default(page: Page, location: str) -> None:
+    tweak_requirements_txt(app_file_path)
     page_url = deploy(location, APP_NAME, app_file_path)
     page.goto(page_url, timeout=PAGE_TIMEOUT)
     verify_express_page_default(page)

tests/playwright/deploys/tests/test_page_fillable.py

@@ -2,7 +2,7 @@
 
 import pytest
 from playwright.sync_api import Page
-from utils.deploy_utils import deploy
+from utils.deploy_utils import deploy, tweak_requirements_txt
 from utils.express_utils import verify_express_page_fillable
 
 APP_DIR = "shiny-express-page-fillable"
@@ -20,6 +20,7 @@
 @pytest.mark.only_browser("chromium")
 @pytest.mark.parametrize("location", ["connect", "shinyapps"])
 def test_express_page_fillable(page: Page, location: str) -> None:
+    tweak_requirements_txt(app_file_path)
     page_url = deploy(location, APP_NAME, app_file_path)
     page.goto(page_url, timeout=PAGE_TIMEOUT)
     verify_express_page_fillable(page)

tests/playwright/deploys/tests/test_page_fluid.py

@@ -2,7 +2,7 @@
 
 import pytest
 from playwright.sync_api import Page
-from utils.deploy_utils import deploy
+from utils.deploy_utils import deploy, tweak_requirements_txt
 from utils.express_utils import verify_express_page_fluid
 
 APP_DIR = "shiny-express-page-fluid"
@@ -20,6 +20,7 @@
 @pytest.mark.only_browser("chromium")
 @pytest.mark.parametrize("location", ["connect", "shinyapps"])
 def test_express_page_fluid(page: Page, location: str) -> None:
+    tweak_requirements_txt(app_file_path)
     page_url = deploy(location, APP_NAME, app_file_path)
     page.goto(page_url, timeout=PAGE_TIMEOUT)
     verify_express_page_fluid(page)

tests/playwright/deploys/tests/test_page_sidebar.py

@@ -2,7 +2,7 @@
 
 import pytest
 from playwright.sync_api import Page
-from utils.deploy_utils import deploy
+from utils.deploy_utils import deploy, tweak_requirements_txt
 from utils.express_utils import verify_express_page_sidebar
 
 APP_DIR = "shiny-express-page-sidebar"
@@ -20,6 +20,7 @@
 @pytest.mark.only_browser("chromium")
 @pytest.mark.parametrize("location", ["connect", "shinyapps"])
 def test_express_page_sidebar(page: Page, location: str) -> None:
+    tweak_requirements_txt(app_file_path)
     page_url = deploy(location, APP_NAME, app_file_path)
     page.goto(page_url, timeout=PAGE_TIMEOUT)
     verify_express_page_sidebar(page)

tests/playwright/deploys/tests/test_plotly_app.py

@@ -2,7 +2,7 @@
 
 import pytest
 from playwright.sync_api import Page, expect
-from utils.deploy_utils import deploy
+from utils.deploy_utils import deploy, tweak_requirements_txt
 
 COUNTRY = "Afghanistan"
 APP_DIR = "plotly_app"
@@ -20,6 +20,7 @@
 @pytest.mark.only_browser("chromium")
 @pytest.mark.parametrize("location", ["connect", "shinyapps"])
 def test_deploys(page: Page, location: str) -> None:
+    tweak_requirements_txt(app_file_path)
     page_url = deploy(location, APP_NAME, app_file_path)
     page.goto(page_url, timeout=PAGE_TIMEOUT)
 

tests/playwright/utils/deploy_utils.py

@@ -100,3 +100,12 @@ def deploy(location: str, app_name: str, app_file_path: str) -> str:
     else:
         raise ValueError("Unknown deploy location. Cannot deploy.")
     return url
+
+
+# Since connect parses python packages, we need to get latest version of shiny on main
+def tweak_requirements_txt(app_file_path: str) -> None:
+    requirements_file_path = os.path.join(app_file_path, "requirements.txt")
+    git_cmd = subprocess.run(["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE)
+    git_hash = git_cmd.stdout.decode("utf-8").strip()
+    with open(requirements_file_path, "a") as f:
+        f.write(f"git+https://github.com/posit-dev/py-shiny.git@{git_hash}\n")