do not install shiny if installing another way

posit-dev · Oct 4, 2024 · ad81c01 · ad81c01
1 parent 3ff6567
commit ad81c01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/py-shiny/setup/action.yaml b/.github/py-shiny/setup/action.yaml
@@ -5,6 +5,10 @@ inputs:
     description: 'Python version to use'
     required: false
     default: "3.12"
+  install:
+    description: 'Should shiny be installed'
+    required: false
+    default: "true"
 runs:
   using: "composite"
   steps:
@@ -30,22 +34,25 @@ runs:
           echo "UV_SYSTEM_PYTHON=1" >> $GITHUB_ENV
 
       - name: Install dependencies
+        if: ${{ inputs.install == 'true' }}
         shell: bash
         run: |
           make ci-install-deps
 
       - name: Install
+        if: ${{ inputs.install == 'true' }}
         shell: bash
         run: |
           make ci-install-wheel
 
       - name: Install backports.tarfile
-        if: ${{ startsWith(inputs.python-version, '3.8') }}
+        if: ${{ startsWith(inputs.python-version, '3.8') && inputs.install == 'true' }}
         shell: bash
         run: |
           uv pip install backports.tarfile
 
       - name: Pip list
+        if: ${{ inputs.install == 'true' }}
         shell: bash
         run: |
           uv pip list
diff --git a/.github/workflows/deploy-tests.yaml b/.github/workflows/deploy-tests.yaml
@@ -77,17 +77,16 @@ jobs:
         uses: ./.github/py-shiny/setup
         with:
           python-version: ${{ matrix.python-version }}
+          install: ${{ !(matrix.config.pypi_shiny || matrix.config.github_shiny) }}
 
       - name: Install pypi shiny and htmltools (uninstall GitHub versions)
         if: ${{ matrix.config.pypi_shiny }}
         run: |
-          uv pip uninstall shiny htmltools
           uv pip install shiny htmltools
 
       - name: Install GitHub shiny@v1.0.0 and htmltools@v0.5.3 (uninstall PyPI versions)
         if: ${{ matrix.config.github_shiny }}
         run: |
-          uv pip uninstall shiny htmltools
           uv pip install "htmltools @ git+https://github.com/posit-dev/py-htmltools.git@v0.5.3" "shiny @ git+https://github.com/posit-dev/py-shiny.git@v1.0.0"
 
       - name: Install rsconnect (PyPI)