Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/main' into raffi_re…
Browse files Browse the repository at this point in the history
…cord_adapter

# Conflicts:
#	py/server/deephaven/table.py
  • Loading branch information
rbasralian committed Aug 23, 2024
2 parents 6745f95 + 187bbb6 commit d9a12bc
Show file tree
Hide file tree
Showing 242 changed files with 7,836 additions and 3,269 deletions.
18 changes: 8 additions & 10 deletions .github/workflows/build-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
distribution: 'temurin'
java-version: '17'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand Down Expand Up @@ -88,11 +91,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Create Dockerfile and context
uses: burrunan/gradle-cache-action@v1
with:
job-id: build-server
arguments: --scan outputVersion docker-server-slim:prepareDocker docker-server:prepareDockerAll
gradle-version: wrapper
run: ./gradlew --scan outputVersion docker-server-slim:prepareDocker docker-server:prepareDockerAll

- name: Get Deephaven Version
id: deephaven_version
Expand Down Expand Up @@ -158,6 +157,9 @@ jobs:
distribution: 'temurin'
java-version: '11'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -182,11 +184,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Create Dockerfile and context
uses: burrunan/gradle-cache-action@v1
with:
job-id: build-web
arguments: --scan outputVersion docker-web-plugin-packager:prepareDocker
gradle-version: wrapper
run: ./gradlew --scan outputVersion docker-web-plugin-packager:prepareDocker

- name: Get Deephaven Version
id: deephaven_version
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/check-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:
distribution: 'temurin'
java-version: '17'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -42,11 +45,7 @@ jobs:
cat gradle.properties
- name: Check
uses: burrunan/gradle-cache-action@v1
with:
job-id: checks
arguments: --scan --continue check
gradle-version: wrapper
run: ./gradlew --scan --continue check

- name: Upload Test Results
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- name: "CLA Assistant"
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
uses: cla-assistant/github-action@v2.4.0
uses: cla-assistant/github-action@v2.5.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_PERSONAL_ACCESS_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-submission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
cat gradle.properties
- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v3
uses: gradle/actions/dependency-submission@v4
env:
# Dependencies derived from :server-jetty-app runtimeClasspath get a "runtime" scope and everything else gets
# a "development" scope. Ideally, gradle would be able to pass along the finer dependency details (for
Expand Down
55 changes: 25 additions & 30 deletions .github/workflows/docs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ jobs:
distribution: 'temurin'
java-version: '17'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -85,12 +88,8 @@ jobs:
cat gradle.properties
- name: All Javadoc
uses: burrunan/gradle-cache-action@v1
with:
job-id: allJavadoc
arguments: --scan outputVersion combined-javadoc:allJavadoc
gradle-version: wrapper

run: ./gradlew --scan outputVersion combined-javadoc:allJavadoc

- name: Get Deephaven Version
id: dhc-version
run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -139,6 +138,9 @@ jobs:
distribution: 'temurin'
java-version: '17'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -148,12 +150,8 @@ jobs:
cat gradle.properties
- name: Run typedoc on JS API
uses: burrunan/gradle-cache-action@v1
with:
job-id: typedoc
arguments: --scan outputVersion :web-client-api:types:typedoc
gradle-version: wrapper

run: ./gradlew --scan outputVersion :web-client-api:types:typedoc

- name: Get Deephaven Version
id: dhc-version
run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -202,6 +200,9 @@ jobs:
distribution: 'temurin'
java-version: '17'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -211,12 +212,8 @@ jobs:
cat gradle.properties
- name: Generate Python Docs
uses: burrunan/gradle-cache-action@v1
with:
job-id: pythonDocs
arguments: --scan outputVersion sphinx:pythonDocs sphinx:pydeephavenDocs
gradle-version: wrapper

run: ./gradlew --scan outputVersion sphinx:pythonDocs sphinx:pydeephavenDocs

- name: Get Deephaven Version
id: dhc-version
run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -285,6 +282,9 @@ jobs:
distribution: 'temurin'
java-version: '11'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -294,12 +294,8 @@ jobs:
cat gradle.properties
- name: Generate C++ Docs
uses: burrunan/gradle-cache-action@v1
with:
job-id: cppDocs
arguments: --scan outputVersion sphinx:cppClientDocs sphinx:cppExamplesDocs
gradle-version: wrapper

run: ./gradlew --scan outputVersion sphinx:cppClientDocs sphinx:cppExamplesDocs

- name: Get Deephaven Version
id: dhc-version
run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -360,6 +356,9 @@ jobs:
distribution: 'temurin'
java-version: '11'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -369,12 +368,8 @@ jobs:
cat gradle.properties
- name: Generate R Docs
uses: burrunan/gradle-cache-action@v1
with:
job-id: rDocs
arguments: --scan outputVersion R:rClientSite
gradle-version: wrapper

run: ./gradlew --scan outputVersion R:rClientSite

- name: Get Deephaven Version
id: dhc-version
run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/nightly-check-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ jobs:
distribution: 'temurin'
java-version: '22'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -64,11 +67,7 @@ jobs:
cat gradle.properties
- name: Run gradle ${{ matrix.gradle-task }} on java ${{ matrix.test-jvm-version }}
uses: burrunan/gradle-cache-action@v1
with:
job-id: gradle-run
arguments: --scan --continue --rerun-tasks ${{ matrix.gradle-task }} -PtestRuntimeVersion=${{ matrix.test-jvm-version }}
gradle-version: wrapper
run: ./gradlew --scan --continue --rerun-tasks ${{ matrix.gradle-task }} -PtestRuntimeVersion=${{ matrix.test-jvm-version }}

- name: Upload Test Results
uses: actions/upload-artifact@v4
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/nightly-image-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ jobs:
distribution: 'temurin'
java-version: '11'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -29,11 +32,7 @@ jobs:
cat gradle.properties
- name: Run gradle
uses: burrunan/gradle-cache-action@v1
with:
job-id: image-compare
arguments: --continue pullImage compareImage
gradle-version: wrapper
run: ./gradlew --continue pullImage compareImage

- name: Notify Slack
uses: slackapi/[email protected]
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/nightly-publish-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ concurrency:
jobs:
nightly-publish:
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'deephaven' }}

steps:
- name: Checkout
Expand All @@ -32,7 +33,7 @@ jobs:
java-version: '17'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down
17 changes: 6 additions & 11 deletions .github/workflows/publish-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:
distribution: 'temurin'
java-version: '17'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -51,20 +54,12 @@ jobs:

- name: Build all artifacts, publish to Maven Local
if: ${{ !startsWith(github.ref, 'refs/heads/release/v') }}
uses: burrunan/gradle-cache-action@v1
with:
job-id: publish-local
arguments: server-netty-app:build server-jetty-app:build py-server:build py-embedded-server:build py-client:build py-client-ticking:build web-client-api:types:build publishToMavenLocal
gradle-version: wrapper
run: ./gradlew server-netty-app:build server-jetty-app:build py-server:build py-embedded-server:build py-client:build py-client-ticking:build web-client-api:types:build publishToMavenLocal

- name: Build all artifacts, publish to Sonatype for staging to Maven Central
if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
uses: burrunan/gradle-cache-action@v1
with:
job-id: publish
# We need to be explicit here about no parallelism to ensure we don't create disjointed staging repositories.
arguments: --no-parallel server-netty-app:build server-jetty-app:build py-server:build py-embedded-server:build py-client:build py-client-ticking:build web-client-api:types:build publish
gradle-version: wrapper
# We need to be explicit here about no parallelism to ensure we don't create disjointed staging repositories.
run: ./gradlew --no-parallel server-netty-app:build server-jetty-app:build py-server:build py-embedded-server:build py-client:build py-client-ticking:build web-client-api:types:build publish
env:
ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.SONATYPE_USERNAME }}
ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.SONATYPE_PASSWORD }}
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/quick-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ jobs:
distribution: 'temurin'
java-version: '11'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV

Expand All @@ -36,12 +39,8 @@ jobs:
cat gradle.properties
- name: Quick Task
uses: burrunan/gradle-cache-action@v1
with:
job-id: quick-task
# Even though quick includes spotlessCheck, we want to make sure it runs first and fails ASAP for quick feedback
arguments: --scan spotlessCheck quick
gradle-version: wrapper
# Even though quick includes spotlessCheck, we want to make sure it runs first and fails ASAP for quick feedback
run: ./gradlew --scan spotlessCheck quick

- name: Upload JVM Error Logs
uses: actions/upload-artifact@v4
Expand All @@ -64,4 +63,4 @@ jobs:
run: pip install vermin==1.6.0

- name: Verify minimum version support
run: vermin -t=3.8 --no-tips --eval-annotations --violations py/server/deephaven py/client py/client-ticking py/embedded-server
run: vermin -t=3.8 --no-tips --eval-annotations --violations --feature fstring-self-doc --feature union-types py/server/deephaven py/client py/client-ticking py/embedded-server
9 changes: 4 additions & 5 deletions .github/workflows/tag-base-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
distribution: 'temurin'
java-version: '17'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Setup Crane
if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
uses: imjasonh/[email protected]
Expand All @@ -50,11 +53,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Create Crane scripts
uses: burrunan/gradle-cache-action@v1
with:
job-id: crane-scripts
arguments: createCraneTagScript
gradle-version: wrapper
run: ./gradlew createCraneTagScript

- name: Tag upstream images
if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ private static List<PyFunc> getPyFuncs() {
rst.add(new PyFunc("y_ticks_minor", SEQUENTIAL, new String[] {"yMinorTicks", "yMinorTicksVisible"}, null,
"Updates the configuration for minor ticks of the y-Axis."));
rst.add(new PyFunc("y_twin", SINGLETON, new String[] {"twinY"}, null,
"Creates a new Axes which shares the y-Axis with the current Axes. For example, this is used for creating plots with a common x-axis but two different y-axes."));
"Creates a new Axes which shares the y-Axis with the current Axes. For example, this is used for creating plots with a common y-axis but two different x-axes."));
rst.add(new PyFunc("series", SEQUENTIAL, new String[] {"series", "group", "seriesColor", "toolTipPattern",
"xToolTipPattern", "yToolTipPattern", "errorBarColor", "gradientVisible", "seriesNamingFunction"}, null,
"Gets a specific data series and updates the data series's configurations."));
Expand Down
1 change: 1 addition & 0 deletions Integrations/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies {
implementation project(':plugin')
implementation project(':Configuration')
implementation project(':log-factory')
implementation libs.commons.lang3

testImplementation project(':engine-test-utils')
testImplementation project(path: ':Base', configuration: 'tests')
Expand Down
Loading

0 comments on commit d9a12bc

Please sign in to comment.