Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into nightly/fix-nightly…
Browse files Browse the repository at this point in the history
…-check

* upstream/main:
  Check documentation labels, fixes deephaven#627 (deephaven#671)
  Fix integer overflow in SortedRanges.invertOnNew.  Fixes deephaven#666. (deephaven#667)
  Fix integer overflow in SortedRanges.subRangeByPos. Fixes deephaven#664 (deephaven#665)
  Deploy example scripts and data (deephaven#562)
  port the numba integration prototype from Enterprise to OSS, fixes feature-523 (deephaven#638)
  Fix IllegalStateException in TwoValuesContainer triggered from Index.insert(Chunk). Fixes deephaven#652. (deephaven#653)
  Javadoc search (deephaven#645)
  Support for jpy integration junit tests (deephaven#632)
  Populate snapshot request in js api, handle optional left table (deephaven#648)
  Fix a link formatting bug in CONTRIBUTING.md (deephaven#629)
  • Loading branch information
devinrsmith committed May 25, 2021
2 parents 912f93f + 0142a72 commit fd3922d
Show file tree
Hide file tree
Showing 76 changed files with 2,101 additions and 1,716 deletions.
20 changes: 20 additions & 0 deletions .github/scripts/check-doc-labels.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env bash

set -o errexit
set -o pipefail
set -o nounset

if [ "${HAS_DocumentationNeeded}" == "true" ] ; then
if [ "${HAS_NoDocumentationNeeded}" == "true" ] ; then
>&2 echo "Conflicting documentation requirements"
exit 1
fi
exit 0
fi

if [ "${HAS_NoDocumentationNeeded}" == "true" ] ; then
exit 0
fi

>&2 echo "No documentation requirements found"
exit 1
21 changes: 16 additions & 5 deletions .github/workflows/docs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,36 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Setup JDK
id: setup-java
- name: Setup JDK 8
id: setup-java-8
uses: actions/setup-java@v1
with:
java-version: '8.0.292'

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v1
with:
java-version: '11.0.11'

- name: Setup gradle properties
run: |
cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java.outputs.path }}" >> gradle.properties
echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-11.outputs.path }}" >> gradle.properties
- name: All Javadoc
uses: burrunan/gradle-cache-action@v1
with:
job-id: allJavadoc
# todo: eventually expand to more
arguments: --scan allJavadoc
arguments: --scan -PincludeJavadoc=true allJavadoc
gradle-version: wrapper

- name: Upload Javadocs
uses: actions/upload-artifact@v2
with:
name: javadocs
path: 'build/docs/javadoc/'

- name: Deploy Javadoc
if: ${{ github.ref == 'refs/heads/main' }}
uses: burnett01/rsync-deployments@4.1
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/label-check-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Label Check CI

on:
pull_request:
# This set of types only causes this workflow to run once when it is opened, or when the labels
# change. For example, it won't be (and doesn't need to be) retriggered when new commits are
# pushed.
types: [ labeled, unlabeled, opened ]
branches: [ main ]

jobs:
doc-labels:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Check Documentation Labels
env:
HAS_DocumentationNeeded: ${{ contains(github.event.pull_request.labels.*.name, 'DocumentationNeeded') }}
HAS_NoDocumentationNeeded: ${{ contains(github.event.pull_request.labels.*.name, 'NoDocumentationNeeded') }}
run: .github/scripts/check-doc-labels.sh
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ out/
*.ipr
*.iws
*.iml
data/
tmp/
target/
IRIS_GRADLE_VERSION
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ To get started quickly:
3) `git clone git@github.com:<username>/deephaven-core.git`
4) Commit changes to your own branches in your forked repository.

Forked repositories do not have access to the same tokens/secrets as the deephaven/deephaven-core depository, so GitHub actions will fail. To disable GitHub actions in your forked repository, go to "Actions" -> "Disable Actions" in your forked repository settings (https://github.com/<username>/deephaven-core/settings/actions).
Forked repositories do not have access to the same tokens/secrets as the [deephaven/deephaven-core](https://github.com/deephaven/deephaven-core) repository, so GitHub actions will fail. To disable GitHub actions in your forked repository, go to "Actions" -> "Disable Actions" in your forked repository settings (`https://github.com/<username>/deephaven-core/settings/actions`).

Over time, forks will get out of sync with the upstream repository. To stay up to date, either:
* Navigate to `https://github.com/<username>/deephaven-core` and click on `Fetch upstream`, or
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,10 @@ public void testComparison() {

@Test
public void testLoadNumpyTwice() {
Assert.assertNotNull(PyModule.importModule("numba"));
Assert.assertNotNull(PyModule.importModule("deephaven/numba"));
Assert.assertNotNull(PyModule.importModule("numpy"));
Assert.assertNotNull(PyModule.importModule("deephaven.lang.vectorize_simple"));
Assert.assertNotNull(PyModule.importModule("numba"));
Assert.assertNotNull(PyModule.importModule("deephaven/numba"));
Assert.assertNotNull(PyModule.importModule("numpy"));
Assert.assertNotNull(PyModule.importModule("deephaven.lang.vectorize_simple"));
}
Expand Down Expand Up @@ -440,10 +440,4 @@ private Index initCheck(String expression, FormulaParserConfiguration parser) {
return conditionFilter.filter(testDataTable.getIndex().clone(), testDataTable.getIndex(), testDataTable, false);
}

private Index initV3PythonCheck(String expression) {
PythonVectorFilter conditionFilter = new PythonVectorFilter(expression.replaceAll(" = ", " == "));
conditionFilter.init(testDataTable.getDefinition());
return conditionFilter.filter(testDataTable.getIndex().clone(), testDataTable.getIndex(), testDataTable, false);
}

}
Loading

0 comments on commit fd3922d

Please sign in to comment.