Skip to content

Commit 3c621e5

Browse files
committed
Fix docs and CI: remove Scala 2.12 tabs for Spark 4.1, fix Python compatibility table, refine CI matrices
1 parent 2a23a99 commit 3c621e5

5 files changed

Lines changed: 9 additions & 85 deletions

File tree

.github/workflows/docker-build.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ jobs:
4949
spark: ['4.0.1', '4.1.0']
5050
include:
5151
- spark: 4.0.1
52-
sedona: 'latest'
53-
geotools: '33.1'
54-
- spark: 4.0.1
55-
sedona: 1.8.0
52+
sedona: 1.8.1
5653
geotools: '33.1'
5754
- spark: 4.1.0
5855
sedona: 'latest'

.github/workflows/java.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,16 @@ jobs:
6363
matrix:
6464
include:
6565
- spark: 4.1.0
66-
scala: 2.13.8
67-
jdk: '17'
68-
- spark: 4.0.0
69-
scala: 2.13.8
66+
scala: 2.13.17
7067
jdk: '17'
71-
- spark: 3.5.4
72-
scala: 2.12.18
68+
- spark: 4.0.2
69+
scala: 2.13.17
7370
jdk: '17'
74-
- spark: 3.5.0
71+
- spark: 3.5.8
7572
scala: 2.13.8
7673
jdk: '11'
7774
skipTests: ''
78-
- spark: 3.5.0
75+
- spark: 3.5.8
7976
scala: 2.12.15
8077
jdk: '11'
8178
skipTests: ''

.github/workflows/python.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -64,55 +64,14 @@ jobs:
6464
scala: '2.13.8'
6565
java: '17'
6666
python: '3.11'
67-
- spark: '4.1.0'
68-
scala: '2.13.8'
69-
java: '17'
70-
python: '3.10'
7167
- spark: '4.0.0'
7268
scala: '2.13.8'
7369
java: '17'
74-
python: '3.11'
75-
- spark: '4.0.0'
76-
scala: '2.13.8'
77-
java: '17'
78-
python: '3.10'
79-
- spark: '3.5.0'
80-
scala: '2.12.8'
81-
java: '11'
82-
python: '3.11'
83-
- spark: '3.5.0'
84-
scala: '2.12.8'
85-
java: '11'
86-
python: '3.10'
87-
shapely: '1'
88-
- spark: '3.5.0'
89-
scala: '2.12.8'
90-
java: '11'
9170
python: '3.10'
9271
- spark: '3.5.0'
9372
scala: '2.12.8'
9473
java: '11'
9574
python: '3.9'
96-
- spark: '3.5.0'
97-
scala: '2.12.8'
98-
java: '11'
99-
python: '3.8'
100-
- spark: '3.4.0'
101-
scala: '2.12.8'
102-
java: '11'
103-
python: '3.11'
104-
- spark: '3.4.0'
105-
scala: '2.12.8'
106-
java: '11'
107-
python: '3.10'
108-
- spark: '3.4.0'
109-
scala: '2.12.8'
110-
java: '11'
111-
python: '3.9'
112-
- spark: '3.4.0'
113-
scala: '2.12.8'
114-
java: '11'
115-
python: '3.8'
11675
- spark: '3.4.0'
11776
scala: '2.12.8'
11877
java: '11'

docs/setup/maven-coordinates.md

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,6 @@ The optional GeoTools library is required if you want to use raster operators. V
8484
</dependency>
8585
```
8686

87-
=== "Spark 4.1 and Scala 2.12"
88-
89-
```xml
90-
<dependency>
91-
<groupId>org.apache.sedona</groupId>
92-
<artifactId>sedona-spark-shaded-4.1_2.12</artifactId>
93-
<version>{{ sedona.current_version }}</version>
94-
</dependency>
95-
<!-- Optional: https://mvnrepository.com/artifact/org.datasyslab/geotools-wrapper -->
96-
<dependency>
97-
<groupId>org.datasyslab</groupId>
98-
<artifactId>geotools-wrapper</artifactId>
99-
<version>{{ sedona.current_geotools }}</version>
100-
</dependency>
101-
```
102-
10387
!!! abstract "Sedona with Apache Spark and Scala 2.13"
10488

10589
=== "Spark 3.4 and Scala 2.13"
@@ -255,19 +239,6 @@ The optional GeoTools library is required if you want to use raster operators. V
255239
<version>{{ sedona.current_geotools }}</version>
256240
</dependency>
257241
```
258-
=== "Spark 4.1 and Scala 2.12"
259-
```xml
260-
<dependency>
261-
<groupId>org.apache.sedona</groupId>
262-
<artifactId>sedona-spark-4.1_2.12</artifactId>
263-
<version>{{ sedona.current_version }}</version>
264-
</dependency>
265-
<dependency>
266-
<groupId>org.datasyslab</groupId>
267-
<artifactId>geotools-wrapper</artifactId>
268-
<version>{{ sedona.current_geotools }}</version>
269-
</dependency>
270-
```
271242

272243
!!! abstract "Sedona with Apache Spark and Scala 2.13"
273244

docs/setup/platform.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ Sedona binary releases are compiled by Java 11/17 and Scala 2.12/2.13 and tested
3535

3636
=== "Sedona Python"
3737

38-
| | Spark 3.4 (Scala 2.12)|Spark 3.5 (Scala 2.12)| Spark 4.0 (Scala 2.12)| Spark 4.1 (Scala 2.13)|
38+
| | Spark 3.4 (Scala 2.12)|Spark 3.5 (Scala 2.12)| Spark 4.0 (Scala 2.13)| Spark 4.1 (Scala 2.13)|
3939
|:---------:|:---------:|:---------:|:---------:|:---------:|
40-
| Python 3.7 | ✅ | ✅ | ✅ | ✅ |
41-
| Python 3.8 | ✅ | ✅ | ✅ | ✅ |
40+
| Python 3.7 | ✅ | ✅ | | |
41+
| Python 3.8 | ✅ | ✅ | | |
4242
| Python 3.9 | ✅ | ✅ | ✅ | ✅ |
4343
| Python 3.10 | ✅ | ✅ | ✅ | ✅ |
4444

0 commit comments

Comments
 (0)