Skip to content

Commit 484f5f7

Browse files
authored
Merge pull request #8 from OKDP/update-docker-stacks
update Jupyter Docker environment with Spark 4, Python 3.12, and faster builds
2 parents 199e033 + eaf8c69 commit 484f5f7

File tree

288 files changed

+5635
-3456
lines changed

Some content is hidden

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

288 files changed

+5635
-3456
lines changed

.build/.versions.yml

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,58 @@ compatibility-matrix:
1010
java_version: [11]
1111
scala_version: [2.12, 2.13]
1212
hadoop_version: 3.2
13-
spark_download_url: https://archive.apache.org/dist/spark/
13+
# spark_download_url: https://archive.apache.org/dist/spark/
14+
spark_download_url: https://github.com/OKDP/jupyterlab-docker/releases/download/spark-tarballs/
1415
# Maximum python version supported by spark-3.3.x: 3.10
1516
# Java support: 8/11/17
1617
- python_version: '3.10'
1718
spark_version: [3.3.1, 3.3.2, 3.3.3, 3.3.4]
1819
java_version: [17]
1920
scala_version: [2.12, 2.13]
2021
hadoop_version: 3
21-
spark_download_url: https://archive.apache.org/dist/spark/
22+
# spark_download_url: https://archive.apache.org/dist/spark/
23+
spark_download_url: https://github.com/OKDP/jupyterlab-docker/releases/download/spark-tarballs/
2224
# Maximum python version supported by spark-3.4.x: 3.11
2325
# Java support: 8/11/17
2426
- python_version: 3.11
25-
spark_version: [3.4.1, 3.4.2]
27+
spark_version: [3.4.1, 3.4.2, 3.4.3, 3.4.4]
2628
java_version: [17]
2729
scala_version: [2.12, 2.13]
2830
hadoop_version: 3
29-
spark_download_url: https://archive.apache.org/dist/spark/
31+
# spark_download_url: https://archive.apache.org/dist/spark/
32+
spark_download_url: https://github.com/OKDP/jupyterlab-docker/releases/download/spark-tarballs/
3033
# https://spark.apache.org/releases/spark-release-3-5-0.html
3134
# Minimum supported java version: 17/21
3235
- python_version: 3.11
33-
spark_version: [3.5.1]
36+
spark_version: [3.5.1, 3.5.2, 3.5.3, 3.5.4, 3.5.5, 3.5.6]
3437
java_version: [17]
3538
scala_version: [2.12, 2.13]
3639
hadoop_version: 3
37-
spark_download_url: https://archive.apache.org/dist/spark/
40+
# spark_download_url: https://archive.apache.org/dist/spark/
41+
spark_download_url: https://github.com/OKDP/jupyterlab-docker/releases/download/spark-tarballs/
42+
# Minimum supported java version: 17/21
43+
# Support was dropped for 2.12 since spark 4
44+
# Maximum python version supported by spark-4.0.x: 3.13
45+
- python_version: 3.12
46+
spark_version: [4.0.0, 4.0.1]
47+
java_version: [17]
48+
scala_version: [2.13]
49+
hadoop_version: 3
50+
# spark_download_url: https://archive.apache.org/dist/spark/
51+
spark_download_url: https://github.com/OKDP/jupyterlab-docker/releases/download/spark-tarballs/
52+
- python_version: 3.13
53+
spark_version: [4.0.0, 4.0.1]
54+
java_version: [17]
55+
scala_version: [2.13]
56+
hadoop_version: 3
57+
# spark_download_url: https://archive.apache.org/dist/spark/
58+
spark_download_url: https://github.com/OKDP/jupyterlab-docker/releases/download/spark-tarballs/
3859
### Override the matrix above by providing the versions to build
3960
### 1- The build-matrix is empty: build with all possible combintations
4061
### 2- Override specific versions: build with all possible combinations which are compatible with that specific versions
4162
### 3- The versions not present on compatibility-matrix are ignored
4263
build-matrix:
43-
python_version: ['3.9', '3.10', '3.11']
44-
spark_version: [3.2.4, 3.3.2, 3.3.4, 3.4.2, 3.5.1]
64+
python_version: ['3.10', '3.11', '3.12']
65+
spark_version: [3.3.4, 3.4.4, 3.5.6, 4.0.1]
4566
java_version: [11, 17]
46-
scala_version: [2.12]
47-
67+
scala_version: [2.13]

.build/python/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Run unit tests
2+
3+
```shell
4+
5+
cd .build/
6+
pytest -c python/pyproject.toml python/tests -v --color=yes
7+
8+
```

.build/python/okdp/extension/tagging/images_hierarchy.py

Lines changed: 0 additions & 141 deletions
This file was deleted.

.build/python/okdp/extension/tagging/taggers.py

Lines changed: 0 additions & 75 deletions
This file was deleted.

.build/python/okdp/patch/README.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

.build/python/pyproject.toml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[build-system]
2+
requires = ["setuptools>=61", "wheel"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[project]
6+
name = "okdp"
7+
version = "0.1.0"
8+
9+
[tool.setuptools.packages.find]
10+
where = ["src"]
11+
include = ["okdp*", "okdp.extension*", "okdp.patches*"]
12+
13+
[tool.pytest.ini_options]
14+
pythonpath = ["src"]
15+
testpaths = ["tests"]
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)