Skip to content

Commit 1b23780

Browse files
committed
Fix CI for Spark 4.0: use Python 3.9 and version-marker pyspark dep
PySpark 4.0 requires Python >=3.9. Update the CI matrix to carry a PYTHON_VERSION per entry (3.8 for Spark 3.x, 3.9 for Spark 4.x) and use it in the setup-python step. Split the pyspark optional dep in pyproject.toml into two version-marker entries so poetry can resolve correctly on both Python 3.8 (pyspark <4.0) and Python 3.9+ (pyspark <5.0). Affirm-Skill: acli-jira Affirm-Skill: att-deploy-check Affirm-Skill: att-test Affirm-Skill: buildkite-debug Affirm-Skill: capture-context Affirm-Skill: cmt-writer Affirm-Skill: commit-and-push Affirm-Skill: create-adr Affirm-Skill: create-cmt-ticket Affirm-Skill: create-tech-spec Affirm-Skill: export-conversation-record Affirm-Skill: gather-best-practices Affirm-Skill: mcp-debug Affirm-Skill: multi-thor-provisioner Affirm-Skill: resolve-pr-comments Affirm-Skill: save-output Affirm-Skill: security-scanner-for-skill-md Affirm-Skill: skill-evaluator Affirm-Skill: thor-control Affirm-Skill: tickets-from-plan Affirm-Skill: write-implementation-plan
1 parent e2ca2c1 commit 1b23780

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

.github/workflows/base.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,27 @@ jobs:
1515
include:
1616
- PYSPARK_VERSION: "3.1.3"
1717
JAVA_VERSION: "11"
18+
PYTHON_VERSION: "3.8"
1819
- PYSPARK_VERSION: "3.2"
1920
JAVA_VERSION: "11"
21+
PYTHON_VERSION: "3.8"
2022
- PYSPARK_VERSION: "3.3"
2123
JAVA_VERSION: "11"
24+
PYTHON_VERSION: "3.8"
2225
- PYSPARK_VERSION: "3.5"
2326
JAVA_VERSION: "11"
27+
PYTHON_VERSION: "3.8"
2428
- PYSPARK_VERSION: "4.0.0"
2529
JAVA_VERSION: "17"
30+
PYTHON_VERSION: "3.9"
2631

2732
steps:
2833
- uses: actions/checkout@v3
2934

3035
- uses: actions/setup-python@v2
31-
name: Install Python 3.8
36+
name: Install Python ${{matrix.PYTHON_VERSION}}
3237
with:
33-
python-version: 3.8
38+
python-version: ${{matrix.PYTHON_VERSION}}
3439

3540
- uses: actions/setup-java@v1
3641
name: Setup Java ${{matrix.JAVA_VERSION}}

pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ classifiers = [
3131
python = ">=3.8,<4"
3232
numpy = ">=1.14.1"
3333
pandas = ">=0.23.0"
34-
pyspark = { version = ">=2.4.7,<5.0.0", optional = true }
34+
pyspark = [
35+
{ version = ">=2.4.7,<4.0.0", optional = true, python = ">=3.8,<3.9" },
36+
{ version = ">=2.4.7,<5.0.0", optional = true, python = ">=3.9" },
37+
]
3538

3639
[tool.poetry.dev-dependencies]
3740
pytest = "^6.2.4"

0 commit comments

Comments
 (0)