Skip to content

Commit 52a8075

Browse files
authored
Merge branch 'apache:master' into master
2 parents 230b4a1 + 5d45ea3 commit 52a8075

File tree

392 files changed

+8021
-5730
lines changed

Some content is hidden

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

392 files changed

+8021
-5730
lines changed

.asf.yaml

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,40 @@
1616
# under the License.
1717

1818
notifications:
19-
20-
issues_status: [email protected]
21-
issues_comment: [email protected]
22-
pullrequests_status: [email protected]
23-
pullrequests_comment: [email protected]
24-
jira_options: link label worklog
19+
20+
issues_status: [email protected]
21+
issues_comment: [email protected]
22+
discussions: [email protected]
23+
pullrequests_status: [email protected]
24+
pullrequests_comment: [email protected]
25+
jira_options: link label worklog
2526
github:
26-
description: "A cluster computing framework for processing large-scale geospatial data"
27-
homepage: https://sedona.apache.org/
28-
collaborators:
29-
- MrPowers
30-
- umartin
31-
- zhangfengcdt
32-
- james-willis
33-
- gregleleu
34-
autolink_jira:
35-
- SEDONA
36-
labels:
37-
- geospatial
38-
- cluster-computing
39-
- spatial-query
40-
- spatial-analysis
41-
- spatial-sql
42-
- scala
43-
- java
44-
- python
45-
features:
46-
# Enable wiki for documentation
47-
wiki: false
48-
# Enable issue management
49-
issues: true
50-
# Enable projects for project management boards
51-
projects: false
52-
ghp_branch:
27+
description: 'A cluster computing framework for processing large-scale geospatial data'
28+
homepage: https://sedona.apache.org/
29+
collaborators:
30+
- MrPowers
31+
- umartin
32+
- zhangfengcdt
33+
- james-willis
34+
- gregleleu
35+
autolink_jira:
36+
- SEDONA
37+
labels:
38+
- geospatial
39+
- cluster-computing
40+
- spatial-query
41+
- spatial-analysis
42+
- spatial-sql
43+
- scala
44+
- java
45+
- python
46+
features:
47+
# Enable wiki for documentation
48+
wiki: false
49+
# Enable issue management
50+
issues: true
51+
# Enable projects for project management boards
52+
projects: false
53+
# Enable GitHub discussion
54+
discussions: true
55+
ghp_branch:

.github/CODEOWNERS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
* @jiayuasu
1+
* @jiayuasu
2+
.editorconfig @jbampton @jiayuasu
3+
.pre-commit-config.yaml @jbampton @jiayuasu
4+
.prettierignore @jbampton @jiayuasu
5+
.prettierrc @jbampton @jiayuasu
6+
.shellcheckrc @jbampton @jiayuasu
7+
Makefile @jbampton @jiayuasu
8+
/.github/linters/ @jbampton @jiayuasu

.github/linters/.yaml-lint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ extends: default
2121

2222
rules:
2323
colons: disable
24+
comments: disable
2425
document-start: disable
2526
line-length: disable
2627
truthy: false

.github/linters/codespell.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
1-
LOD
21
actualy
32
afterall
43
atmost
5-
bu
64
celle
75
checkin
86
eiter
9-
errorprone
10-
fpt
11-
limite
12-
nd
13-
ois
147
parm
158
pavin
169
pixelx
17-
refere
1810
ser
1911
shouldbe
2012
wel

.github/workflows/docker-build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ on:
3333
env:
3434
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
3535

36+
concurrency:
37+
group: ${{ github.workflow }}-${{ github.ref }}
38+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
39+
3640
permissions:
3741
contents: read
3842

@@ -45,8 +49,8 @@ jobs:
4549
spark: ['3.5.1', '3.4.3', '3.3.4']
4650
include:
4751
- spark: 3.5.1
48-
sedona: "latest"
49-
geotools: "auto"
52+
sedona: 'latest'
53+
geotools: 'auto'
5054
- spark: 3.4.3
5155
sedona: 1.6.0
5256
geotools: 28.2

.github/workflows/docs.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ on:
2929
env:
3030
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
3131

32+
concurrency:
33+
group: ${{ github.workflow }}-${{ github.ref }}
34+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
35+
3236
jobs:
3337
build:
3438
runs-on: ubuntu-22.04
@@ -40,31 +44,27 @@ jobs:
4044
uses: actions/setup-java@v4
4145
with:
4246
distribution: 'zulu'
43-
java-version: '8'
47+
java-version: '11'
4448
- name: Compile JavaDoc
4549
run: mvn -q clean install -DskipTests && mkdir -p docs/api/javadoc/spark && cp -r spark/common/target/apidocs/* docs/api/javadoc/spark/
4650
- name: Compile ScalaDoc
47-
run: mvn scala:doc && mkdir -p docs/api/scaladoc/spark && cp -r spark/common/target/site/scaladocs/* docs/api/scaladoc/spark
51+
run: mvn scala:doc -pl !common,!snowflake,!flink && mkdir -p docs/api/scaladoc/spark && cp -r spark/common/target/site/scaladocs/* docs/api/scaladoc/spark
4852
- uses: actions/setup-python@v5
4953
with:
5054
python-version: 3.x
51-
- run: pip install mkdocs-jupyter
52-
- run: pip install mkdocs-material
53-
- run: pip install mkdocs-macros-plugin
54-
- run: pip install mkdocs-git-revision-date-localized-plugin
55-
- run: pip install mike
55+
- run: pip install -r requirements-docs.txt
5656
- run: sudo apt update
57-
- uses: r-lib/actions/[email protected].2
57+
- uses: r-lib/actions/[email protected].3
5858
with:
5959
r-version: release
6060
use-public-rspm: true
6161
- name: Query R dependencies
62-
uses: r-lib/actions/[email protected].2
62+
uses: r-lib/actions/[email protected].3
6363
with:
6464
cache: true
6565
extra-packages: |
6666
any::pkgdown
67-
working-directory : './R'
67+
working-directory: './R'
6868
- run: Rscript -e 'pkgdown::build_site(pkg = "./R", preview = FALSE, override = list(destination = "../docs/api/rdocs"))'
6969
- run: git config --global user.name = "GitHub Action"
7070
- run: git config --global user.email = "[email protected]"

.github/workflows/example.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ on:
3333
permissions:
3434
contents: read
3535

36+
concurrency:
37+
group: ${{ github.workflow }}-${{ github.ref }}
38+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
39+
3640
jobs:
3741
build:
3842
runs-on: ubuntu-22.04
@@ -54,7 +58,7 @@ jobs:
5458
- uses: actions/setup-java@v4
5559
with:
5660
distribution: 'zulu'
57-
java-version: '8'
61+
java-version: '11'
5862
- run: sudo apt-get remove scala-library scala
5963
- run: sudo wget www.scala-lang.org/files/archive/scala-2.12.11.deb
6064
- run: sudo dpkg -i scala-2.12.11.deb
@@ -78,6 +82,7 @@ jobs:
7882
restore-keys: ${{ runner.os }}-m2
7983
- env:
8084
SPARK_VERSION: ${{ matrix.spark }}
85+
SPARK_LOCAL_IP: 127.0.0.1
8186
SPARK_COMPAT_VERSION: ${{ matrix.spark-compat }}
8287
SEDONA_VERSION: ${{ matrix.sedona }}
8388
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)

.github/workflows/first-interaction.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ on:
2323
pull_request:
2424
types: [opened]
2525

26+
concurrency:
27+
group: ${{ github.workflow }}-${{ github.ref }}
28+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
29+
2630
jobs:
2731
first-interaction:
2832
runs-on: ubuntu-latest
@@ -31,5 +35,5 @@ jobs:
3135
uses: actions/first-interaction@v1
3236
with:
3337
repo-token: ${{ secrets.GITHUB_TOKEN }}
34-
issue-message: "Thank you for your interest in Apache Sedona! We appreciate you opening your first issue. Contributions like yours help make Apache Sedona better."
35-
pr-message: "Welcome and thank you for your first pull request! We appreciate your contribution to Apache Sedona. Your code changes will be reviewed shortly."
38+
issue-message: 'Thank you for your interest in Apache Sedona! We appreciate you opening your first issue. Contributions like yours help make Apache Sedona better.'
39+
pr-message: 'Welcome and thank you for your first pull request! We appreciate your contribution to Apache Sedona. Your code changes will be reviewed shortly.'

.github/workflows/java.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,15 @@ on:
4646
env:
4747
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
4848
DO_NOT_TRACK: true
49+
SPARK_LOCAL_IP: 127.0.0.1
4950

5051
permissions:
5152
contents: read
5253

54+
concurrency:
55+
group: ${{ github.workflow }}-${{ github.ref }}
56+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
57+
5358
jobs:
5459
build:
5560
runs-on: ubuntu-22.04
@@ -59,35 +64,27 @@ jobs:
5964
include:
6065
- spark: 3.5.0
6166
scala: 2.13.8
62-
jdk: '8'
63-
skipTests: ''
64-
- spark: 3.5.0
65-
scala: 2.12.15
66-
jdk: '8'
67+
jdk: '11'
6768
skipTests: ''
6869
- spark: 3.5.0
6970
scala: 2.12.15
7071
jdk: '11'
7172
skipTests: ''
7273
- spark: 3.4.0
7374
scala: 2.13.8
74-
jdk: '8'
75-
skipTests: ''
76-
- spark: 3.4.0
77-
scala: 2.12.15
78-
jdk: '8'
75+
jdk: '11'
7976
skipTests: ''
8077
- spark: 3.4.0
8178
scala: 2.12.15
8279
jdk: '11'
8380
skipTests: ''
8481
- spark: 3.3.0
8582
scala: 2.13.8
86-
jdk: '8'
83+
jdk: '11'
8784
skipTests: ''
8885
- spark: 3.3.0
8986
scala: 2.12.15
90-
jdk: '8'
87+
jdk: '11'
9188
skipTests: ''
9289
steps:
9390
- uses: actions/checkout@v4
@@ -97,7 +94,7 @@ jobs:
9794
java-version: ${{ matrix.jdk }}
9895
- uses: actions/setup-python@v5
9996
with:
100-
python-version: '3.7'
97+
python-version: '3.10'
10198
- name: Cache Maven packages
10299
uses: actions/cache@v4
103100
with:
@@ -110,6 +107,12 @@ jobs:
110107
SKIP_TESTS: ${{ matrix.skipTests }}
111108
run: |
112109
SPARK_COMPAT_VERSION=${SPARK_VERSION:0:3}
110+
111+
if [ "${SPARK_VERSION}" == "3.5.0" ]; then
112+
pip install pyspark==3.5.0 pandas shapely apache-sedona pyarrow
113+
export SPARK_HOME=$(python -c "import pyspark; print(pyspark.__path__[0])")
114+
fi
115+
113116
mvn -q clean install -Dspark=${SPARK_COMPAT_VERSION} -Dscala=${SCALA_VERSION:0:4} -Dspark.version=${SPARK_VERSION} ${SKIP_TESTS}
114117
- run: mkdir staging
115118
- run: cp spark-shaded/target/sedona-*.jar staging

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ jobs:
2828
steps:
2929
- uses: actions/labeler@v5
3030
with:
31-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
31+
repo-token: '${{ secrets.GITHUB_TOKEN }}'
3232
sync-labels: true

.github/workflows/lint.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,22 @@ on: [pull_request]
2222
permissions:
2323
contents: read
2424

25+
concurrency:
26+
group: ${{ github.workflow }}-${{ github.ref }}
27+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
28+
2529
jobs:
2630
pre-commit:
27-
name: Run pre-commit # https://pre-commit.com/
31+
name: Run pre-commit # https://pre-commit.com/
2832
runs-on: ubuntu-latest
2933
steps:
30-
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
34+
- name: 'Checkout ${{ github.ref }} ( ${{ github.sha }} )'
3135
uses: actions/checkout@v4
32-
- uses: actions/setup-python@v5 # https://www.python.org/
36+
- uses: actions/setup-python@v5 # https://www.python.org/
3337
with:
34-
python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax
35-
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
36-
- name: Install dependencies # https://pip.pypa.io/en/stable/
38+
python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax
39+
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
40+
- name: Install dependencies # https://pip.pypa.io/en/stable/
3741
run: |
3842
python -m pip install --upgrade pip
3943
pip install pre-commit

.github/workflows/python-extension.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ on:
4242
permissions:
4343
contents: read
4444

45+
concurrency:
46+
group: ${{ github.workflow }}-${{ github.ref }}
47+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
48+
4549
jobs:
4650
build:
4751
strategy:
@@ -62,8 +66,13 @@ jobs:
6266
- name: Install dependencies
6367
run: |
6468
cd python
65-
pipenv --python ${{ matrix.python }}
66-
pipenv install --dev
69+
if [[ "$RUNNER_OS" == "Windows" ]]; then
70+
PYTHON_EXE_PATH="$pythonLocation/python.exe"
71+
else
72+
PYTHON_EXE_PATH="$pythonLocation/python"
73+
fi
74+
echo "Using Python executable at: $PYTHON_EXE_PATH"
75+
pipenv install --dev --python "$PYTHON_EXE_PATH"
6776
- name: Build extension
6877
run: |
6978
cd python

.github/workflows/python-wheel.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ on:
3939
- 'python/**'
4040
- '.github/workflows/python-wheel.yml'
4141

42+
concurrency:
43+
group: ${{ github.workflow }}-${{ github.ref }}
44+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
45+
4246
jobs:
4347
build:
4448
strategy:
@@ -59,7 +63,7 @@ jobs:
5963
image: tonistiigi/binfmt:qemu-v8.1.5
6064
platforms: all
6165
- name: Build wheels
62-
uses: pypa/cibuildwheel@v2.22.0
66+
uses: pypa/cibuildwheel@v2.23.3
6367
env:
6468
CIBW_SKIP: 'pp* *musl*'
6569
CIBW_ARCHS_LINUX: 'x86_64 aarch64'

0 commit comments

Comments
 (0)