Cleanup

Author: hansthen

.github/workflows/test_code.yml

@@ -45,12 +45,6 @@ jobs:
         pwd
         ls -la
 
-    - name: Debug step
-      run: |
-        pwd
-        echo '====='
-        ls .coverage*
-
     - name: Upload coverage
       if: always()
       uses: actions/upload-artifact@v4

.github/workflows/test_geopandas.yml

@@ -11,6 +11,9 @@ on:
 jobs:
   run:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
     - name: Checkout Folium
@@ -55,3 +58,4 @@ jobs:
         name: coverage-test-geopandas
         path: |
           .coverage*
+        include-hidden-files: true

.github/workflows/test_latest_branca.yml

@@ -11,6 +11,9 @@ on:
 jobs:
   run:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
     - uses: actions/checkout@v4
@@ -25,11 +28,9 @@ jobs:
           --file requirements-dev.txt
 
     - name: Install folium from source
-      shell: bash -l {0}
       run: python -m pip install -e . --no-deps --force-reinstall
 
     - name: Tests with latest branca
-      shell: bash -l {0}
       run: |
         micromamba remove branca --yes --force
         python -m pip install git+https://github.com/python-visualization/branca.git
@@ -42,3 +43,4 @@ jobs:
         name: coverage-test-branca
         path: |
           .coverage*
+        include-hidden-files: true

.github/workflows/test_mypy.yml

@@ -11,6 +11,9 @@ on:
 jobs:
   run:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
     - uses: actions/checkout@v4
@@ -25,11 +28,9 @@ jobs:
           --file requirements-dev.txt
 
     - name: Install folium from source
-      shell: bash -l {0}
       run: |
         python -m pip install -e . --no-deps --force-reinstall
 
     - name: Mypy test
-      shell: bash -l {0}
       run: |
         mypy folium

.github/workflows/test_selenium.yml

@@ -15,6 +15,9 @@ jobs:
       matrix:
         python-version: [ "3.9", "3.13" ]
       fail-fast: false
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
     - uses: actions/checkout@v4
@@ -29,17 +32,16 @@ jobs:
           --file requirements-dev.txt
 
     - name: Install folium from source
-      shell: bash -l {0}
       run: python -m pip install -e . --no-deps --force-reinstall
 
     - name: Selenium tests
-      shell: bash -l {0}
       run: coverage run -p -m pytest tests/selenium -vv
 
     - name: Upload coverage
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: coverage-test-selenium
+        name: coverage-test-selenium-${{ matrix.python-version }}
         path: |
           .coverage*
+        include-hidden-files: true

.github/workflows/test_snapshots.yml

@@ -9,6 +9,9 @@ on:
 jobs:
   run:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
     - name: Checkout Folium
@@ -24,17 +27,14 @@ jobs:
           --file requirements-dev.txt
 
     - name: Install pytest plugins and pixelmatch
-      shell: bash -l {0}
       run: |
         pip install pixelmatch pytest-github-actions-annotate-failures pytest-rerunfailures
 
     - name: Install folium from source
-      shell: bash -l {0}
       run: |
         python -m pip install -e . --no-deps --force-reinstall
 
     - name: Test with pytest
-      shell: bash -l {0}
       run: |
         coverage run -p -m pytest tests/snapshots -s --junit-xml=test-results.xml
 
@@ -61,3 +61,4 @@ jobs:
         name: coverage-test-snapshots
         path: |
           .coverage*
+        include-hidden-files: true

.github/workflows/test_streamlit_folium.yml

@@ -11,6 +11,9 @@ on:
 jobs:
   run:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
     - name: Set up Python
@@ -29,40 +32,34 @@ jobs:
         path: streamlit_folium  # Checkout into a subdirectory
 
     - name: Build streamlit_folium javascript
-      shell: bash -l {0}
       run: |
         cd streamlit_folium/streamlit_folium/frontend/
         npm install
         npm run build
 
     - name: Install streamlit_folium dev dependencies
-      shell: bash -l {0}
       run: |
         cd streamlit_folium
         python -m pip install --upgrade pip
         pip install -r tests/requirements.txt
 
     - name: Install streamlit-folium
-      shell: bash -l {0}
       run: |
         cd streamlit_folium
         pip install -e .
 
     - name: Install playwright dependencies
-      shell: bash -l {0}
       run: |
         playwright install --with-deps
 
     - name: Install annotate-failures-plugin
       run: pip install pytest-github-actions-annotate-failures coverage
 
     - name: Install folium from source
-      shell: bash -l {0}
       run: |
         python -m pip install -e . --force-reinstall
 
     - name: Test with pytest and retry flaky tests up to 3 times
-      shell: bash -l {0}
       run: |
         cd streamlit_folium
         python -m pytest tests/test_frontend.py --browser chromium -s --reruns 3 -k "not test_layer_control_dynamic_update"