Skip to content

Commit 73e1aa3

Browse files
pan3793pan3793
authored
[ZEPPELIN-5979] Support and use Python 3.9 in default (#4690)
1 parent 9dadde3 commit 73e1aa3

File tree

9 files changed

+93
-37
lines changed

9 files changed

+93
-37
lines changed

‎.github/workflows/core.yml

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ jobs:
6868
run: ./mvnw install -Pbuild-distr -DskipTests -pl zeppelin-server,zeppelin-web,spark-submit,spark/scala-2.12,spark/scala-2.13,markdown,angular,shell -am -Phelium-dev -Pexamples -P${{ matrix.hadoop }} ${MAVEN_ARGS}
6969
- name: install and test plugins
7070
run: ./mvnw package -pl zeppelin-plugins -amd ${MAVEN_ARGS}
71-
- name: Setup conda environment with python 3.7 and R
71+
- name: Setup conda environment with python 3.9 and R
7272
uses: conda-incubator/setup-miniconda@v2
7373
with:
7474
activate-environment: python_3_with_R
75-
environment-file: testing/env_python_3.7_with_R.yml
76-
python-version: 3.7
75+
environment-file: testing/env_python_3.9_with_R.yml
76+
python-version: 3.9
7777
miniforge-variant: Mambaforge
7878
channels: conda-forge,defaults
7979
channel-priority: true
@@ -119,12 +119,12 @@ jobs:
119119
${{ runner.os }}-zeppelin-
120120
- name: install environment
121121
run: ./mvnw install -DskipTests -am -pl ${INTERPRETERS} -Pscala-2.11 ${MAVEN_ARGS}
122-
- name: Setup conda environment with python 3.7 and R
122+
- name: Setup conda environment with python 3.9 and R
123123
uses: conda-incubator/setup-miniconda@v2
124124
with:
125125
activate-environment: python_3_with_R_and_tensorflow
126126
environment-file: testing/env_python_3_with_R_and_tensorflow.yml
127-
python-version: 3.7
127+
python-version: 3.9
128128
miniforge-variant: Mambaforge
129129
channels: conda-forge,defaults
130130
channel-priority: true
@@ -139,8 +139,13 @@ jobs:
139139
strategy:
140140
fail-fast: false
141141
matrix:
142-
python: [ 3.7, 3.8 ]
142+
python: [ 3.9 ]
143143
java: [ 8, 11 ]
144+
include:
145+
- python: 3.7
146+
java: 8
147+
- python: 3.8
148+
java: 8
144149
steps:
145150
- name: Checkout
146151
uses: actions/checkout@v3
@@ -218,12 +223,12 @@ jobs:
218223
run: |
219224
./mvnw install -DskipTests -Phadoop2 -Pintegration -pl zeppelin-interpreter-integration,zeppelin-web,spark-submit,spark/scala-2.12,spark/scala-2.13,markdown,flink-cmd,flink/flink-scala-2.12,jdbc,shell -am -Pflink-117 ${MAVEN_ARGS}
220225
./mvnw package -pl zeppelin-plugins -amd -DskipTests ${MAVEN_ARGS}
221-
- name: Setup conda environment with python 3.7 and R
226+
- name: Setup conda environment with python 3.9 and R
222227
uses: conda-incubator/setup-miniconda@v2
223228
with:
224229
activate-environment: python_3_with_R
225230
environment-file: testing/env_python_3_with_R.yml
226-
python-version: 3.7
231+
python-version: 3.9
227232
miniforge-variant: Mambaforge
228233
channels: conda-forge,defaults
229234
channel-priority: true
@@ -243,7 +248,13 @@ jobs:
243248
strategy:
244249
fail-fast: false
245250
matrix:
246-
flink: [115, 116, 117]
251+
python: [ 3.9 ]
252+
flink: [116, 117]
253+
include:
254+
# Flink 1.15 supports Python 3.6, 3.7, and 3.8
255+
# https://nightlies.apache.org/flink/flink-docs-release-1.15/docs/dev/python/installation/
256+
- python: 3.8
257+
flink: 115
247258
steps:
248259
- name: Checkout
249260
uses: actions/checkout@v3
@@ -269,12 +280,12 @@ jobs:
269280
run: |
270281
./mvnw install -DskipTests -am -pl flink/flink-scala-2.12,flink-cmd,zeppelin-interpreter-integration -Pflink-${{ matrix.flink }} -Phadoop2 -Pintegration ${MAVEN_ARGS}
271282
./mvnw clean package -pl zeppelin-plugins -amd -DskipTests ${MAVEN_ARGS}
272-
- name: Setup conda environment with python 3.7 and
283+
- name: Setup conda environment with python ${{ matrix.python }} and R
273284
uses: conda-incubator/setup-miniconda@v2
274285
with:
275286
activate-environment: python_3_with_flink
276287
environment-file: testing/env_python_3_with_flink_${{ matrix.flink }}.yml
277-
python-version: 3.7
288+
python-version: ${{ matrix.python }}
278289
miniforge-variant: Mambaforge
279290
channels: conda-forge,defaults
280291
channel-priority: true
@@ -319,12 +330,12 @@ jobs:
319330
run: |
320331
./mvnw install -DskipTests -pl zeppelin-interpreter-integration,zeppelin-web,spark-submit,spark/scala-2.12,spark/scala-2.13,markdown -am -Phadoop2 -Pintegration ${MAVEN_ARGS}
321332
./mvnw clean package -pl zeppelin-plugins -amd -DskipTests ${MAVEN_ARGS}
322-
- name: Setup conda environment with python 3.7 and R
333+
- name: Setup conda environment with python 3.9 and R
323334
uses: conda-incubator/setup-miniconda@v2
324335
with:
325336
activate-environment: python_3_with_R
326337
environment-file: testing/env_python_3_with_R.yml
327-
python-version: 3.7
338+
python-version: 3.9
328339
miniforge-variant: Mambaforge
329340
channels: conda-forge,defaults
330341
channel-priority: true
@@ -342,8 +353,13 @@ jobs:
342353
strategy:
343354
fail-fast: false
344355
matrix:
345-
python: [ 3.7, 3.8 ]
356+
python: [ 3.9 ]
346357
java: [ 8, 11 ]
358+
include:
359+
- python: 3.7
360+
java: 8
361+
- python: 3.8
362+
java: 8
347363
steps:
348364
- name: Checkout
349365
uses: actions/checkout@v3
@@ -435,12 +451,12 @@ jobs:
435451
./mvnw install -DskipTests -pl livy -am ${MAVEN_ARGS}
436452
./testing/downloadSpark.sh "3.4.1" "3"
437453
./testing/downloadLivy.sh "0.7.1-incubating"
438-
- name: Setup conda environment with python 3.7 and R
454+
- name: Setup conda environment with python 3.9 and R
439455
uses: conda-incubator/setup-miniconda@v2
440456
with:
441457
activate-environment: python_3_with_R
442458
environment-file: testing/env_python_3_with_R.yml
443-
python-version: 3.7
459+
python-version: 3.9
444460
miniforge-variant: Mambaforge
445461
channels: conda-forge,defaults
446462
channel-priority: true

‎.github/workflows/frontend.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ jobs:
112112
key: ${{ runner.os }}-zeppelin-${{ hashFiles('**/pom.xml') }}
113113
restore-keys: |
114114
${{ runner.os }}-zeppelin-
115-
- name: Setup conda environment with python 3.7 and R
115+
- name: Setup conda environment with python 3.9 and R
116116
uses: conda-incubator/setup-miniconda@v2
117117
with:
118118
activate-environment: python_3_with_R
119119
environment-file: testing/env_python_3_with_R.yml
120-
python-version: 3.7
120+
python-version: 3.9
121121
miniforge-variant: Mambaforge
122122
channels: conda-forge,defaults
123123
channel-priority: true

‎docs/interpreter/python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ channels:
443443
- conda-forge
444444
- defaults
445445
dependencies:
446-
- python=3.7
446+
- python=3.9
447447
- jupyter
448448
- grpcio
449449
- protobuf

‎docs/interpreter/r.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ channels:
361361
- conda-forge
362362
- defaults
363363
dependencies:
364-
- python=3.7
364+
- python=3.9
365365
- jupyter
366366
- grpcio
367367
- protobuf

‎testing/env_python_3.9_with_R.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: python_3_with_R
2+
channels:
3+
- conda-forge
4+
- defaults
5+
dependencies:
6+
- pycodestyle
7+
- scipy
8+
- numpy=1.19.5
9+
- grpcio
10+
- protobuf
11+
- pandasql
12+
- sqlalchemy=1.4.46
13+
- ipython
14+
- ipython_genutils
15+
- ipykernel
16+
- jupyter_client=5
17+
- hvplot
18+
- holoviews=1.16
19+
- plotnine
20+
- seaborn
21+
- intake
22+
- intake-parquet
23+
- intake-xarray
24+
- altair
25+
- vega_datasets
26+
- plotly
27+
- jinja2=3.0.3
28+
- pip
29+
- r-base=3.6
30+
- r-data.table
31+
- r-evaluate
32+
- r-base64enc
33+
- r-knitr
34+
- r-ggplot2
35+
- r-irkernel
36+
- r-shiny
37+
- r-googlevis

‎testing/env_python_3.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6-
- pycodestyle=2.5.0
7-
- numpy=1.17.3
8-
- pandas=0.25.0
9-
- scipy=1.3.1
10-
- grpcio=1.22.0
11-
- hvplot=0.5.2
12-
- protobuf=3.10.0
13-
- pandasql=0.7.3
14-
- ipython=7.8.0
15-
- matplotlib=3.0.3
16-
- ipykernel=5.1.2
17-
- jupyter_client=5.3.4
18-
- bokeh=1.3.4
6+
- pycodestyle
7+
- numpy=1.19.5
8+
- pandas=1.4.4
9+
- scipy
10+
- grpcio
11+
- hvplot
12+
- protobuf
13+
- pandasql
14+
- ipython
15+
- matplotlib
16+
- ipykernel
17+
- jupyter_client=5
18+
- bokeh=2.4
1919
- panel=0.6.0
20-
- holoviews=1.12.3
20+
- holoviews=1.16
2121
- jinja2=3.0.3
2222
- pip
2323
- pip:

‎testing/env_python_3_with_R.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies:
99
- grpcio
1010
- protobuf
1111
- pandasql
12+
- sqlalchemy=1.4.46
1213
- ipython
1314
- ipython_genutils
1415
- ipykernel
@@ -17,7 +18,7 @@ dependencies:
1718
- holoviews=1.16
1819
- plotnine
1920
- seaborn
20-
- bokeh
21+
- bokeh=2.4
2122
- intake
2223
- intake-parquet
2324
- intake-xarray

‎testing/env_python_3_with_R_and_tensorflow.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies:
99
- grpcio
1010
- protobuf
1111
- pandasql
12+
- sqlalchemy=1.4.46
1213
- ipython
1314
- ipython_genutils
1415
- ipykernel
@@ -17,7 +18,7 @@ dependencies:
1718
- holoviews=1.16
1819
- plotnine
1920
- seaborn
20-
- bokeh
21+
- bokeh=2.4
2122
- intake
2223
- intake-parquet
2324
- intake-xarray
@@ -35,4 +36,4 @@ dependencies:
3536
- r-irkernel
3637
- r-shiny
3738
- r-googlevis
38-
- tensorflow=1.13
39+
- tensorflow

‎testing/env_python_3_with_flink_117.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies:
1414
- ipykernel
1515
- jupyter_client=5
1616
- hvplot
17+
- holoviews=1.16
1718
- plotnine
1819
- seaborn
1920
- intake

0 commit comments

Comments
 (0)