Initial commit

Author: sfc-gh-kmcgrady

.github/workflows/test-and-release.yml

@@ -0,0 +1,59 @@
+name: "Build, Test, and Release on new release branch"
+
+on:
+  push:
+    branches:
+      - "release/*"
+
+jobs:
+  build_and_test:
+    name: "Build & Test"
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+
+      - name: Install dependencies
+        run: |
+          cd streamlit_bokeh_chart/frontend
+          npm ci
+
+      - name: Build component
+        run: |
+          cd streamlit_bokeh_chart/frontend
+          npm run build
+
+      - name: Install Playwright
+        # If your project doesn't already install Playwright as a devDependency, do so here:
+        run: npm install -D @playwright/test
+
+      - name: Run Playwright E2E tests
+        run: npx playwright test e2e_playwright
+        # ^ Adjust path or script as needed:
+        # Example: `npm run test:e2e` if you have it defined in package.json
+
+  release:
+    name: "Create a Release"
+    runs-on: ubuntu-latest
+    needs: build_and_test # Only run if build_and_test succeeds
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Create GitHub Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref_name }} # For example "release/1.2.3"
+          release_name: "Release ${{ github.ref_name }}"
+          draft: false
+          prerelease: false

.github/workflows/update-bokeh.yml

@@ -0,0 +1,42 @@
+name: "Update Bokeh"
+
+on:
+  workflow_dispatch:
+
+jobs:
+  update-bokeh:
+    runs-on: ubuntu-latest
+
+    # Ensure we can push back to the repository
+    permissions:
+      contents: write
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: pip install requests
+
+      - name: Run script
+        id: compare_bokeh
+        run: python scripts/update-bokeh.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Commit changes
+        if: steps.compare_bokeh.outputs.needs_update == 'true'
+        run: |
+          echo "NEW_VERSION=${{ steps.compare_bokeh.outputs.new_version }}" >> $GITHUB_ENV
+          BRANCH="release/${NEW_VERSION}"
+          git config user.name "github-actions"
+          git config user.email "github-actions@github.com"
+          git checkout -b "${BRANCH}"
+          git add .
+          git commit -m "Update Bokeh to ${NEW_VERSION}"
+          git push origin "${BRANCH}"

scripts/update_bokeh_version.py

@@ -0,0 +1,110 @@
+import importlib.metadata
+import os
+import re
+import requests
+
+def get_latest_bokeh_version():
+    url = "https://pypi.org/pypi/bokeh/json"
+    response = requests.get(url)
+    response.raise_for_status()  # Raises an HTTPError if the status is not 200
+    data = response.json()
+    return data["info"]["version"]
+
+def download_files(new_version, destination):
+    files_to_download = [
+        f"https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-{new_version}.min.js",
+        f"https://cdn.bokeh.org/bokeh/release/bokeh-gl-{new_version}.min.js",
+        f"https://cdn.bokeh.org/bokeh/release/bokeh-api-{new_version}.min.js",
+        f"https://cdn.bokeh.org/bokeh/release/bokeh-tables-{new_version}.min.js",
+        f"https://cdn.bokeh.org/bokeh/release/bokeh-widgets-{new_version}.min.js",
+        f"https://cdn.bokeh.org/bokeh/release/bokeh-{new_version}.min.js"
+    ]
+
+    for url in files_to_download:
+        filename = os.path.basename(url)
+        print(f"Downloading {filename}")
+        r = requests.get(url, stream=True)
+        r.raise_for_status()
+        with open(os.path.join(destination, filename), "wb") as f:
+            for chunk in r.iter_content(chunk_size=8192):
+                f.write(chunk)
+
+def update_setup_py(old_version, new_version):
+    setup_py_path = "setup.py"
+    with open(setup_py_path, "r") as f:
+        setup_content = f.read()
+    
+    # Replace package version in `version='...'`
+    # This pattern is naive; adapt as needed for your file structure.
+    setup_content = re.sub(
+        r"(version\s*=\s*['\"])([\d\.]+)(['\"])",
+        rf"\g<1>{new_version}\g<3>",
+        setup_content
+    )
+
+    # Replace bokeh==old_version with bokeh==new_version
+    if old_version:
+        setup_content = re.sub(
+            rf"(bokeh\s*==\s*){old_version}",
+            rf"\g<1>{new_version}",
+            setup_content
+        )
+
+    with open(setup_py_path, "w") as f:
+        f.write(setup_content)
+
+def update_index_html(public_dir, old_version, new_version):
+    index_html_path = os.path.join(public_dir, "index.html")
+    if os.path.exists(index_html_path):
+        with open(index_html_path, "r", encoding="utf-8") as f:
+            html_content = f.read()
+
+        # If old_version is known, do a direct replacement 
+        if old_version:
+            # Replace each script reference with the new version
+            cdn_suffixes = [
+                "mathjax",
+                "gl",
+                "api",
+                "tables",
+                "widgets",
+                ""
+            ]
+            for suffix in cdn_suffixes:
+                old_str = f"bokeh-{suffix}-{old_version}.min.js" if suffix else f"bokeh-{old_version}.min.js"
+                new_str = f"bokeh-{suffix}-{new_version}.min.js" if suffix else f"bokeh-{new_version}.min.js"
+                html_content = html_content.replace(old_str, new_str)
+
+        with open(index_html_path, "w", encoding="utf-8") as f:
+            f.write(html_content)
+    else:
+        print("No index.html found in frontend/public. Skipping HTML update.")
+
+
+if __name__ == "__main__":
+    new_version = get_latest_bokeh_version()
+    old_version = importlib.metadata.version("streamlit_bokeh_chart")
+    
+    print(f"Current local bokeh version: {old_version}")
+    print(f"Latest PyPI bokeh version: {new_version}")
+
+    if new_version == old_version:
+        print("No new version available")
+        print(f"::set-output name=needs_update::false")
+        exit(0)
+
+    print("New version available!")
+    public_dir = "streamlit_bokeh_chart/frontend/public"
+
+    # Remove original files
+    for filename in os.listdir(public_dir):
+        if "bokeh" in filename and filename.endswith(".js"):
+            os.remove(os.path.join(public_dir, filename))
+
+    download_files(new_version, public_dir)
+    update_setup_py(old_version, new_version)
+    update_index_html(public_dir, old_version, new_version)
+
+    print(f"::set-output name=needs_update::true")
+    print(f"::set-output name=old_version::{old_version}")
+    print(f"::set-output name=new_version::{new_version}")