Skip to content

Commit 378338c

Browse files
AnandInguvaAnandInguva
authored
[BEAM-13657] Sunset python 3.6 (#17252)
1 parent 839ff57 commit 378338c

File tree

20 files changed

+18
-336
lines changed

20 files changed

+18
-336
lines changed

‎.github/workflows/build_wheels.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,13 @@ jobs:
207207
strategy:
208208
matrix:
209209
os_python: [
210-
{"os": "ubuntu-latest", "python": "cp36-* cp37-* cp38-* cp39-*"},
211-
{"os": "macos-latest", "python": "cp36-* cp37-* cp38-* cp39-*"},
212-
{"os": "windows-latest", "python": "cp36-* cp37-* cp38-* cp39-*"},
210+
{"os": "ubuntu-latest", "python": "cp37-* cp38-* cp39-*"},
211+
{"os": "macos-latest", "python": "cp37-* cp38-* cp39-*"},
212+
{"os": "windows-latest", "python": "cp37-* cp38-* cp39-*"},
213213
]
214214
arch: [auto]
215215
include:
216-
- os_python: {"os": "ubuntu-latest", "python": "cp36-* cp37-* cp38-* cp39-*"}
216+
- os_python: {"os": "ubuntu-latest", "python": "cp37-* cp38-* cp39-*"}
217217
arch: aarch64
218218
steps:
219219
- name: Download python source distribution from artifacts

‎.github/workflows/python_tests.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ jobs:
9797
matrix:
9898
os: [ubuntu-latest, macos-latest, windows-latest]
9999
params: [
100-
{"py_ver": "3.6", "tox_env": "py36"},
101100
{"py_ver": "3.7", "tox_env": "py37"},
102101
{"py_ver": "3.8", "tox_env": "py38"},
103102
{"py_ver": "3.9", "tox_env": "py39"},
@@ -136,7 +135,7 @@ jobs:
136135
fail-fast: false
137136
matrix:
138137
os: [ubuntu-latest, macos-latest, windows-latest]
139-
python: [3.6, 3.7, 3.8, 3.9]
138+
python: [3.7, 3.8, 3.9]
140139
steps:
141140
- name: Checkout code
142141
uses: actions/checkout@v2
@@ -164,7 +163,7 @@ jobs:
164163
fail-fast: false
165164
matrix:
166165
os: [ubuntu-latest, macos-latest, windows-latest]
167-
python: [3.6, 3.7, 3.8, 3.9]
166+
python: [3.7, 3.8, 3.9]
168167
steps:
169168
- name: Checkout code
170169
uses: actions/checkout@v2

‎.test-infra/jenkins/PythonTestProperties.groovy‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class PythonTestProperties {
2020
// Indicates all supported Python versions.
2121
// This must be sorted in ascending order.
2222
final static List<String> ALL_SUPPORTED_VERSIONS = [
23-
'3.6',
2423
'3.7',
2524
'3.8',
2625
'3.9'

‎.test-infra/jenkins/README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ Beam Jenkins overview page: [link](https://ci-beam.apache.org/)
118118
| beam_PostCommit_Python_Chicago_Taxi_Example_Flink | [cron](https://ci-beam.apache.org/job/beam_PostCommit_Python_Chicago_Taxi_Flink/), [phrase](https://ci-beam.apache.org/job/beam_PostCommit_Python_Chicago_Taxi_Flink_PR/) | `Run Chicago Taxi on Flink` | [![Build Status](https://ci-beam.apache.org/job/beam_PostCommit_Python_Chicago_Taxi_Flink/badge/icon)](https://ci-beam.apache.org/job/beam_PostCommit_Python_Chicago_Taxi_Flink) |
119119
| beam_PostCommit_Python_MongoDBIO_IT | [cron](https://ci-beam.apache.org/job/beam_PostCommit_Python_MongoDBIO_IT), [phrase](https://ci-beam.apache.org/job/beam_PostCommit_Python_MongoDBIO_IT_PR/) | `Run Python MongoDBIO_IT` | [![Build Status](https://ci-beam.apache.org/job/beam_PostCommit_Python_MongoDBIO_IT/badge/icon)](https://ci-beam.apache.org/job/beam_PostCommit_Python_MongoDBIO_IT) |
120120
| beam_PostCommit_Python_VR_Spark | [cron](https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Spark/), [phrase](https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Spark/) | `Run Python Spark ValidatesRunner` | [![Build Status](https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Spark/badge/icon)](https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Spark) |
121-
| beam_PostCommit_Python36 | [cron](https://ci-beam.apache.org/job/beam_PostCommit_Python36), [phrase](https://ci-beam.apache.org/job/beam_PostCommit_Python36_PR/) | `Run Python 3.6 PostCommit` | [![Build Status](https://ci-beam.apache.org/job/beam_PostCommit_Python36/badge/icon)](https://ci-beam.apache.org/job/beam_PostCommit_Python36) |
122121
| beam_PostCommit_Python37 | [cron](https://ci-beam.apache.org/job/beam_PostCommit_Python37), [phrase](https://ci-beam.apache.org/job/beam_PostCommit_Python37_PR/) | `Run Python 3.7 PostCommit` | [![Build Status](https://ci-beam.apache.org/job/beam_PostCommit_Python37/badge/icon)](https://ci-beam.apache.org/job/beam_PostCommit_Python37) |
123122
| beam_PostCommit_Python38 | [cron](https://ci-beam.apache.org/job/beam_PostCommit_Python38), [phrase](https://ci-beam.apache.org/job/beam_PostCommit_Python38_PR/) | `Run Python 3.8 PostCommit` | [![Build Status](https://ci-beam.apache.org/job/beam_PostCommit_Python38/badge/icon)](https://ci-beam.apache.org/job/beam_PostCommit_Python38) |
124123
| beam_PostCommit_SQL | [cron](https://ci-beam.apache.org/job/beam_PostCommit_SQL/), [phrase](https://ci-beam.apache.org/job/beam_PostCommit_SQL_PR/) | `Run SQL PostCommit` | [![Build Status](https://ci-beam.apache.org/job/beam_PostCommit_SQL/badge/icon)](https://ci-beam.apache.org/job/beam_PostCommit_SQL) |
@@ -253,4 +252,4 @@ Beam Jenkins overview page: [link](https://ci-beam.apache.org/)
253252
retest this please
254253
```
255254

256-
* Last update (mm/dd/yyyy): 25/01/2022
255+
* Last update (mm/dd/yyyy): 04/04/2022

‎.test-infra/jenkins/job_PostCommit_PortableJar_Flink.groovy‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_PortableJar_Flink',
3131
steps {
3232
gradle {
3333
rootBuildScriptDir(commonJobProperties.checkoutDir)
34-
tasks(':sdks:python:test-suites:portable:py36:testPipelineJarFlinkRunner')
3534
tasks(':sdks:python:test-suites:portable:py37:testPipelineJarFlinkRunner')
3635
commonJobProperties.setGradleSwitches(delegate)
3736
}

‎.test-infra/jenkins/job_PreCommit_Portable_Python.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ builder.build {
4343
steps {
4444
gradle {
4545
rootBuildScriptDir(commonJobProperties.checkoutDir)
46-
tasks(':sdks:python:test-suites:portable:py36:preCommitPy36')
46+
tasks(':sdks:python:test-suites:portable:py37:preCommitPy37')
4747
commonJobProperties.setGradleSwitches(delegate)
4848
}
4949
gradle {

‎build.gradle.kts‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ tasks.register("playgroundPreCommit") {
269269

270270
tasks.register("pythonPreCommit") {
271271
dependsOn(":sdks:python:test-suites:tox:pycommon:preCommitPyCommon")
272-
dependsOn(":sdks:python:test-suites:tox:py36:preCommitPy36")
273272
dependsOn(":sdks:python:test-suites:tox:py37:preCommitPy37")
274273
dependsOn(":sdks:python:test-suites:tox:py38:preCommitPy38")
275274
dependsOn(":sdks:python:test-suites:tox:py39:preCommitPy39")
@@ -282,7 +281,6 @@ tasks.register("pythonDocsPreCommit") {
282281
}
283282

284283
tasks.register("pythonDockerBuildPreCommit") {
285-
dependsOn(":sdks:python:container:py36:docker")
286284
dependsOn(":sdks:python:container:py37:docker")
287285
dependsOn(":sdks:python:container:py38:docker")
288286
dependsOn(":sdks:python:container:py39:docker")
@@ -297,12 +295,6 @@ tasks.register("pythonFormatterPreCommit") {
297295
dependsOn("sdks:python:test-suites:tox:py38:formatter")
298296
}
299297

300-
tasks.register("python36PostCommit") {
301-
dependsOn(":sdks:python:test-suites:dataflow:py36:postCommitIT")
302-
dependsOn(":sdks:python:test-suites:direct:py36:postCommitIT")
303-
dependsOn(":sdks:python:test-suites:portable:py36:postCommitPy36")
304-
}
305-
306298
tasks.register("python37PostCommit") {
307299
dependsOn(":sdks:python:test-suites:dataflow:py37:postCommitIT")
308300
dependsOn(":sdks:python:test-suites:direct:py37:postCommitIT")
@@ -330,12 +322,11 @@ tasks.register("python39PostCommit") {
330322
}
331323

332324
tasks.register("portablePythonPreCommit") {
333-
dependsOn(":sdks:python:test-suites:portable:py36:preCommitPy36")
325+
dependsOn(":sdks:python:test-suites:portable:py37:preCommitPy37")
334326
dependsOn(":sdks:python:test-suites:portable:py39:preCommitPy39")
335327
}
336328

337329
tasks.register("pythonSparkPostCommit") {
338-
dependsOn(":sdks:python:test-suites:portable:py36:sparkValidatesRunner")
339330
dependsOn(":sdks:python:test-suites:portable:py37:sparkValidatesRunner")
340331
dependsOn(":sdks:python:test-suites:portable:py38:sparkValidatesRunner")
341332
dependsOn(":sdks:python:test-suites:portable:py39:sparkValidatesRunner")

‎buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2628,7 +2628,6 @@ class BeamModulePlugin implements Plugin<Project> {
26282628
mustRunAfter = [
26292629
":runners:flink:${project.ext.latestFlinkVersion}:job-server:shadowJar",
26302630
':runners:spark:2:job-server:shadowJar',
2631-
':sdks:python:container:py36:docker',
26322631
':sdks:python:container:py37:docker',
26332632
':sdks:python:container:py38:docker',
26342633
':sdks:python:container:py39:docker',

‎sdks/python/container/build.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,18 @@ goBuild {
3636
}
3737

3838
tasks.register("buildAll") {
39-
dependsOn ':sdks:python:container:py36:docker'
4039
dependsOn ':sdks:python:container:py37:docker'
4140
dependsOn ':sdks:python:container:py38:docker'
4241
dependsOn ':sdks:python:container:py39:docker'
4342
}
4443

4544
tasks.register("pushAll") {
46-
dependsOn ':sdks:python:container:py36:dockerPush'
4745
dependsOn ':sdks:python:container:py37:dockerPush'
4846
dependsOn ':sdks:python:container:py38:dockerPush'
4947
dependsOn ':sdks:python:container:py39:dockerPush'
5048
}
5149

5250
tasks.register("generatePythonRequirementsAll") {
53-
dependsOn ':sdks:python:container:py36:generatePythonRequirements'
5451
dependsOn ':sdks:python:container:py37:generatePythonRequirements'
5552
dependsOn ':sdks:python:container:py38:generatePythonRequirements'
5653
dependsOn ':sdks:python:container:py39:generatePythonRequirements'

‎sdks/python/container/py36/base_image_requirements.txt‎

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

0 commit comments

Comments
 (0)