Skip to content

Commit 4887315

Browse files
committed
Merge branch 'refs/heads/master' into st-max-inscribed-cir
# Conflicts: # snowflake-tester/src/test/java/org/apache/sedona/snowflake/snowsql/TestTableFunctions.java
2 parents c971c93 + 0a1db3d commit 4887315

File tree

21 files changed

+486
-453
lines changed

21 files changed

+486
-453
lines changed

.asf.yaml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ notifications:
66
pullrequests_comment: [email protected]
77
jira_options: link label worklog
88
github:
9-
description: "A cluster computing framework for processing large-scale geospatial data"
10-
homepage: https://sedona.apache.org/
11-
autolink_jira:
12-
- SEDONA
13-
labels:
14-
- geospatial
15-
- cluster-computing
16-
- spatial-query
17-
- spatial-analysis
18-
- spatial-sql
19-
- scala
20-
- java
21-
- python
22-
features:
23-
# Enable wiki for documentation
24-
wiki: false
25-
# Enable issue management
26-
issues: true
27-
# Enable projects for project management boards
28-
projects: false
29-
ghp_branch:
9+
description: "A cluster computing framework for processing large-scale geospatial data"
10+
homepage: https://sedona.apache.org/
11+
autolink_jira:
12+
- SEDONA
13+
labels:
14+
- geospatial
15+
- cluster-computing
16+
- spatial-query
17+
- spatial-analysis
18+
- spatial-sql
19+
- scala
20+
- java
21+
- python
22+
features:
23+
# Enable wiki for documentation
24+
wiki: false
25+
# Enable issue management
26+
issues: true
27+
# Enable projects for project management boards
28+
projects: false
29+
ghp_branch:

.github/linters/.yaml-lint.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
# https://yamllint.readthedocs.io/en/stable/
3+
extends: default
4+
5+
rules:
6+
colons: disable
7+
comments: disable
8+
comments-indentation: disable
9+
document-start: disable
10+
line-length: disable
11+
truthy: false

.github/linters/codespell.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
actualy
22
afterall
3+
atmost
34
bu
45
celle
6+
checkin
57
eiter
68
errorprone
79
fpt

.github/workflows/docker-build.yml

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,30 +40,29 @@ jobs:
4040
defaults:
4141
run:
4242
shell: bash
43-
4443
steps:
45-
- uses: actions/checkout@v4
46-
- uses: actions/setup-java@v4
47-
with:
48-
distribution: 'zulu'
49-
java-version: 11
50-
- name: Cache Maven packages
51-
uses: actions/cache@v3
52-
with:
53-
path: ~/.m2
54-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
55-
restore-keys: ${{ runner.os }}-m2
56-
- name: Setup docker (missing on macOS)
57-
if: runner.os == 'macos'
58-
run: |
59-
brew install docker
60-
colima start
61-
DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
62-
mkdir -p $DOCKER_CONFIG/cli-plugins
63-
curl -SL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.darwin-amd64 -o $DOCKER_CONFIG/cli-plugins/docker-buildx
64-
chmod +x $DOCKER_CONFIG/cli-plugins/docker-buildx
65-
- env:
66-
SPARK_VERSION: ${{ matrix.spark }}
67-
SEDONA_VERSION: ${{ matrix.sedona }}
68-
GEOTOOLS_VERSION: ${{ matrix.geotools }}
69-
run: ./docker/sedona-spark-jupyterlab/build.sh ${SPARK_VERSION} ${SEDONA_VERSION} local ${GEOTOOLS_VERSION}
44+
- uses: actions/checkout@v4
45+
- uses: actions/setup-java@v4
46+
with:
47+
distribution: 'zulu'
48+
java-version: 11
49+
- name: Cache Maven packages
50+
uses: actions/cache@v3
51+
with:
52+
path: ~/.m2
53+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
54+
restore-keys: ${{ runner.os }}-m2
55+
- name: Setup docker (missing on macOS)
56+
if: runner.os == 'macos'
57+
run: |
58+
brew install docker
59+
colima start
60+
DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
61+
mkdir -p $DOCKER_CONFIG/cli-plugins
62+
curl -SL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.darwin-amd64 -o $DOCKER_CONFIG/cli-plugins/docker-buildx
63+
chmod +x $DOCKER_CONFIG/cli-plugins/docker-buildx
64+
- env:
65+
SPARK_VERSION: ${{ matrix.spark }}
66+
SEDONA_VERSION: ${{ matrix.sedona }}
67+
GEOTOOLS_VERSION: ${{ matrix.geotools }}
68+
run: ./docker/sedona-spark-jupyterlab/build.sh ${SPARK_VERSION} ${SEDONA_VERSION} local ${GEOTOOLS_VERSION}

.github/workflows/docs.yml

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -15,62 +15,62 @@ jobs:
1515
build:
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v4
19-
with:
20-
fetch-depth: 0
21-
- name: Set up Java
22-
uses: actions/setup-java@v4
23-
with:
24-
distribution: 'zulu'
25-
java-version: '8'
26-
- name: Compile JavaDoc
27-
run: mvn -q clean install -DskipTests && mkdir -p docs/api/javadoc/spark && cp -r spark/common/target/apidocs/* docs/api/javadoc/spark/
28-
- name: Compile ScalaDoc
29-
run: mvn scala:doc && mkdir -p docs/api/scaladoc/spark && cp -r spark/common/target/site/scaladocs/* docs/api/scaladoc/spark
30-
- uses: actions/setup-python@v5
31-
with:
32-
python-version: 3.x
33-
- run: pip install mkdocs-jupyter
34-
- run: pip install mkdocs-material
35-
- run: pip install mkdocs-macros-plugin
36-
- run: pip install mkdocs-git-revision-date-localized-plugin
37-
- run: pip install mike
38-
- run: sudo apt update
39-
- uses: r-lib/actions/setup-r@v2
40-
with:
41-
r-version: release
42-
use-public-rspm: true
43-
- name: Query R dependencies
44-
uses: r-lib/actions/setup-r-dependencies@v2
45-
with:
46-
cache: true
47-
extra-packages: |
48-
any::pkgdown
49-
working-directory : './R'
50-
- run: Rscript -e 'pkgdown::build_site(pkg = "./R", preview = FALSE, override = list(destination = "../docs/api/rdocs"))'
51-
- run: git config --global user.name = "GitHub Action"
52-
- run: git config --global user.email = "[email protected]"
53-
- run: mkdocs build
54-
- run: git fetch origin website --depth=1
55-
- name: Deploy the doc to the website branch
56-
if: ${{ github.event_name != 'pull_request' && github.repository == 'apache/sedona' }}
57-
run: mike deploy latest-snapshot -b website -p
58-
- run: mkdir staging
59-
- run: cp -r site/* staging/
60-
- uses: actions/upload-artifact@v3
61-
with:
62-
name: generated-docs
63-
path: staging
64-
- name: Cache Python packages
65-
uses: actions/cache@v3
66-
with:
67-
path: ~/.cache/pip
68-
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
69-
restore-keys: |
70-
${{ runner.os }}-pip-
71-
- name: Cache Maven packages
72-
uses: actions/cache@v3
73-
with:
74-
path: ~/.m2
75-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
76-
restore-keys: ${{ runner.os }}-m2
18+
- uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
- name: Set up Java
22+
uses: actions/setup-java@v4
23+
with:
24+
distribution: 'zulu'
25+
java-version: '8'
26+
- name: Compile JavaDoc
27+
run: mvn -q clean install -DskipTests && mkdir -p docs/api/javadoc/spark && cp -r spark/common/target/apidocs/* docs/api/javadoc/spark/
28+
- name: Compile ScalaDoc
29+
run: mvn scala:doc && mkdir -p docs/api/scaladoc/spark && cp -r spark/common/target/site/scaladocs/* docs/api/scaladoc/spark
30+
- uses: actions/setup-python@v5
31+
with:
32+
python-version: 3.x
33+
- run: pip install mkdocs-jupyter
34+
- run: pip install mkdocs-material
35+
- run: pip install mkdocs-macros-plugin
36+
- run: pip install mkdocs-git-revision-date-localized-plugin
37+
- run: pip install mike
38+
- run: sudo apt update
39+
- uses: r-lib/actions/setup-r@v2
40+
with:
41+
r-version: release
42+
use-public-rspm: true
43+
- name: Query R dependencies
44+
uses: r-lib/actions/setup-r-dependencies@v2
45+
with:
46+
cache: true
47+
extra-packages: |
48+
any::pkgdown
49+
working-directory : './R'
50+
- run: Rscript -e 'pkgdown::build_site(pkg = "./R", preview = FALSE, override = list(destination = "../docs/api/rdocs"))'
51+
- run: git config --global user.name = "GitHub Action"
52+
- run: git config --global user.email = "[email protected]"
53+
- run: mkdocs build
54+
- run: git fetch origin website --depth=1
55+
- name: Deploy the doc to the website branch
56+
if: ${{ github.event_name != 'pull_request' && github.repository == 'apache/sedona' }}
57+
run: mike deploy latest-snapshot -b website -p
58+
- run: mkdir staging
59+
- run: cp -r site/* staging/
60+
- uses: actions/upload-artifact@v3
61+
with:
62+
name: generated-docs
63+
path: staging
64+
- name: Cache Python packages
65+
uses: actions/cache@v3
66+
with:
67+
path: ~/.cache/pip
68+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
69+
restore-keys: |
70+
${{ runner.os }}-pip-
71+
- name: Cache Maven packages
72+
uses: actions/cache@v3
73+
with:
74+
path: ~/.m2
75+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
76+
restore-keys: ${{ runner.os }}-m2

.github/workflows/example.yml

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ permissions:
1818

1919
jobs:
2020
build:
21-
2221
runs-on: ubuntu-22.04
2322
strategy:
2423
fail-fast: false
@@ -33,37 +32,36 @@ jobs:
3332
- spark: 3.3.4
3433
spark-compat: '3.0'
3534
sedona: 1.5.1
36-
3735
steps:
38-
- uses: actions/checkout@v4
39-
- uses: actions/setup-java@v4
40-
with:
41-
distribution: 'zulu'
42-
java-version: '8'
43-
- run: sudo apt-get remove scala-library scala
44-
- run: sudo wget www.scala-lang.org/files/archive/scala-2.12.11.deb
45-
- run: sudo dpkg -i scala-2.12.11.deb
46-
- run: scala -version
47-
- run: echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list
48-
- run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
49-
- run: sudo apt-get update
50-
- run: sudo apt-get install sbt
51-
- name: Cache SBT
52-
uses: actions/cache@v3
53-
with:
54-
path: |
55-
~/.ivy2/cache
56-
~/.sbt
57-
key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt') }}
58-
- name: Cache Maven packages
59-
uses: actions/cache@v3
60-
with:
61-
path: ~/.m2
62-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
63-
restore-keys: ${{ runner.os }}-m2
64-
- env:
65-
SPARK_VERSION: ${{ matrix.spark }}
66-
SPARK_COMPAT_VERSION: ${{ matrix.spark-compat }}
67-
SEDONA_VERSION: ${{ matrix.sedona }}
68-
run: (cd examples/spark-sql;mvn clean install -Dspark.version=${SPARK_VERSION} -Dspark.compat.version=${SPARK_COMPAT_VERSION} -Dsedona.version=${SEDONA_VERSION};java -jar target/sedona-spark-example-1.6.0.jar)
69-
- run: (cd examples/flink-sql;mvn clean install;java -jar target/sedona-flink-example-1.6.0.jar)
36+
- uses: actions/checkout@v4
37+
- uses: actions/setup-java@v4
38+
with:
39+
distribution: 'zulu'
40+
java-version: '8'
41+
- run: sudo apt-get remove scala-library scala
42+
- run: sudo wget www.scala-lang.org/files/archive/scala-2.12.11.deb
43+
- run: sudo dpkg -i scala-2.12.11.deb
44+
- run: scala -version
45+
- run: echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list
46+
- run: sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
47+
- run: sudo apt-get update
48+
- run: sudo apt-get install sbt
49+
- name: Cache SBT
50+
uses: actions/cache@v3
51+
with:
52+
path: |
53+
~/.ivy2/cache
54+
~/.sbt
55+
key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt') }}
56+
- name: Cache Maven packages
57+
uses: actions/cache@v3
58+
with:
59+
path: ~/.m2
60+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
61+
restore-keys: ${{ runner.os }}-m2
62+
- env:
63+
SPARK_VERSION: ${{ matrix.spark }}
64+
SPARK_COMPAT_VERSION: ${{ matrix.spark-compat }}
65+
SEDONA_VERSION: ${{ matrix.sedona }}
66+
run: (cd examples/spark-sql;mvn clean install -Dspark.version=${SPARK_VERSION} -Dspark.compat.version=${SPARK_COMPAT_VERSION} -Dsedona.version=${SEDONA_VERSION};java -jar target/sedona-spark-example-1.6.0.jar)
67+
- run: (cd examples/flink-sql;mvn clean install;java -jar target/sedona-flink-example-1.6.0.jar)

0 commit comments

Comments
 (0)