Merge remote-tracking branch 'upstream/branch-3.6' into branch-3.6

.github/workflows/bokeh-ci.yml

@@ -179,36 +179,6 @@ jobs:
           name: examples-report
           path: examples-report
 
-  integration-tests:
-    if: ${{ false }}  # disable for now
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Prepare Environment
-        uses: ./.github/workflows/composite/test-setup
-        with:
-          test-env: '3.11'
-          source-tree: 'delete'
-
-      - name: List installed software
-        run: |
-          conda info
-          conda list
-          echo "node $(node --version)"
-          echo "npm $(npm --version)"
-
-      - name: Run tests
-        run: pytest -v --cov=bokeh --cov-report=xml --tb=short --driver chrome --color=yes tests/integration
-
-      - name: Upload code coverage
-        uses: codecov/codecov-action@v4
-        with:
-          flags: integration
-          verbose: true
-
   unit-test:
     needs: build
     runs-on: ${{ matrix.os }}
@@ -351,27 +321,3 @@ jobs:
 
       - name: Run tests
         run: bash scripts/ci/run_downstream_tests.sh
-
-  docker_from_wheel:
-    if: ${{ false }}  # temporarily disable
-    needs: build
-    runs-on: ubuntu-latest
-    env:
-      IMAGE_TAG: bokeh/bokeh-dev:branch-3.1
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Download wheel package
-        id: download
-        uses: actions/download-artifact@v4
-        with:
-          name: wheel-package
-          path: dist/
-
-      - name: Start Docker container, install Bokeh from wheel and run Python tests.
-        env:
-          BOKEH_DOCKER_FROM_WHEEL: 1
-          BOKEH_DOCKER_INTERACTIVE: 0
-        run: |
-          scripts/docker/docker_run.sh $IMAGE_TAG

.gitignore

@@ -45,6 +45,7 @@
 .sw[nop]
 *.tmp
 .vscode
+.idea
 
 # compressed / binary files
 *.bz2

README.md

@@ -26,7 +26,7 @@
   </td>
 
   <td>
-    <a href="https://github.com/bokeh/bokeh/blob/main/LICENSE.txt">
+    <a href="https://github.com/bokeh/bokeh/blob/-/LICENSE.txt">
     <img src="https://img.shields.io/github/license/bokeh/bokeh.svg?color=ECD078&style=for-the-badge"
          alt="Bokeh license (BSD 3-clause)" />
     </a>

bokehjs/make/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bokeh/make",
-  "version": "3.5.0-dev.3",
+  "version": "3.6.0-dev.1",
   "private": true,
   "description": "Internal package for bokehjs' build system",
   "license": "BSD-3-Clause",
@@ -13,18 +13,18 @@
   ],
   "devDependencies": {
     "@types/eslint": "^8.56.7",
-    "@types/node": "^20.12.4",
+    "@types/node": "^20.14.7",
     "@types/which": "^3.0.3",
     "@types/yargs": "^17.0.32",
-    "acorn": "^8.11.3",
+    "acorn": "^8.12.1",
     "chalk": "^4.1.2",
     "del": "^6.1.1",
-    "eslint": "^8.57.0",
-    "semver": "^7.6.0",
+    "eslint": "^8.56.0",
+    "semver": "^7.6.2",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typescript-eslint": "^7.5.0",
-    "typescript": "~5.4.3",
+    "typescript-eslint": "^7.16.0",
+    "typescript": "~5.5.3",
     "which": "^3.0.1",
     "yargs": "^17.7.2"
   }