Skip to content

Commit 7338925

Browse files
authored
Merge branch 'master' into add-pre-commit-hook-check-json
2 parents 3e76bae + 347550c commit 7338925

File tree

1,153 files changed

+1215948
-68565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,153 files changed

+1215948
-68565
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: issues@sedona.apache.org
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:

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
* text=auto eol=lf
2+
*.bat text eol=crlf
3+
*.cmd text eol=crlf
4+
*.png binary

.github/labeler.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ root:
55
- any-glob-to-any-file:
66
- '*'
77

8+
binder:
9+
- any:
10+
- changed-files:
11+
- any-glob-to-any-file:
12+
- binder/**/*
13+
814
docs:
915
- any:
1016
- changed-files:

.github/linters/.markdown-lint.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,11 @@ MD034: false
3030
# no-emphasis-as-heading - Emphasis used instead of a heading
3131
MD036: false
3232

33-
# no-space-in-code - Spaces inside code span elements
34-
MD038: false
35-
3633
# fenced-code-language - Fenced code blocks should have a language specified
3734
MD040: false
3835

3936
# first-line-heading/first-line-h1 - First line in a file should be a top-level heading
4037
MD041: false
4138

42-
# no-alt-text - Images should have alternate text (alt text)
43-
MD045: false
44-
4539
# code-block-style - Code block style
4640
MD046: false

.github/linters/.yaml-lint.yml

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

.github/linters/codespell.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
LOD
12
actualy
23
afterall
4+
atmost
35
bu
46
celle
7+
checkin
58
eiter
69
errorprone
710
fpt

.github/pull_request_template.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010

1111
- Yes, the URL of the associated JIRA ticket is https://issues.apache.org/jira/browse/SEDONA-XXX. The PR name follows the format `[SEDONA-XXX] my subject`.
1212

13-
- No, this is a documentation update. The PR name follows the format `[DOCS] my subject`.
13+
- No:
14+
- this is a documentation update. The PR name follows the format `[DOCS] my subject`
15+
- this is a CI update. The PR name follows the format `[CI] my subject`
1416

1517

1618
## What changes were proposed in this PR?

.github/workflows/docker-build.yml

Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
branches:
66
- master
77
paths:
8+
- '.github/workflows/docker-build.yml'
89
- 'docker/**'
910
pull_request:
1011
branches:
1112
- '*'
1213
paths:
14+
- '.github/workflows/docker-build.yml'
1315
- 'docker/**'
1416
env:
1517
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
@@ -22,37 +24,45 @@ jobs:
2224
strategy:
2325
fail-fast: true
2426
matrix:
25-
os: ['ubuntu-latest', 'macos-latest']
27+
os: ['ubuntu-latest', 'macos-12']
28+
spark: ['3.5.1', '3.4.3', '3.3.4']
2629
include:
27-
- spark: 3.4.1
28-
sedona: 1.4.1
29-
- spark: 3.4.1
30-
sedona: latest
31-
- spark: 3.3.2
32-
sedona: latest
30+
- spark: 3.5.1
31+
sedona: "latest"
32+
geotools: "auto"
33+
- spark: 3.4.3
34+
sedona: 1.6.0
35+
geotools: 28.2
36+
- spark: 3.3.4
37+
sedona: 1.6.0
38+
geotools: 28.2
3339
runs-on: ${{ matrix.os }}
3440
defaults:
3541
run:
3642
shell: bash
37-
3843
steps:
39-
- uses: actions/checkout@v4
40-
- uses: actions/setup-java@v4
41-
with:
42-
distribution: 'zulu'
43-
java-version: 11
44-
- name: Cache Maven packages
45-
uses: actions/cache@v3
46-
with:
47-
path: ~/.m2
48-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
49-
restore-keys: ${{ runner.os }}-m2
50-
- name: Setup docker (missing on macOS)
51-
if: runner.os == 'macos'
52-
run: |
53-
brew install docker
54-
colima start
55-
- env:
56-
SPARK_VERSION: ${{ matrix.spark }}
57-
SEDONA_VERSION: ${{ matrix.sedona }}
58-
run: ./docker/sedona-spark-jupyterlab/build.sh ${SPARK_VERSION} ${SEDONA_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: 67 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- branch-*
67

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

0 commit comments

Comments
 (0)