Skip to content

Commit 174ce99

Browse files
committed
pyspark
1 parent 1b6f4de commit 174ce99

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

.github/workflows/test-integrations-tasks.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,6 @@ jobs:
133133
with:
134134
python-version: ${{ matrix.python-version }}
135135
allow-prereleases: true
136-
- uses: actions/setup-java@v4
137-
with:
138-
distribution: 'temurin'
139-
java-version: '21'
140136
- name: Start Redis
141137
uses: supercharge/[email protected]
142138
- name: Setup Test Env
@@ -176,9 +172,6 @@ jobs:
176172
- name: Test spark pinned
177173
run: |
178174
set -x # print commands that are executed
179-
echo "java home $JAVA_HOME"
180-
java --version
181-
update-alternatives --list java
182175
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-spark"
183176
- name: Generate coverage XML (Python 3.6)
184177
if: ${{ !cancelled() && matrix.python-version == '3.6' }}

scripts/populate_tox/config.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@
163163
"spark": {
164164
"package": "pyspark",
165165
"python": ">=3.8",
166+
# XXX: spark 4.0.0 needs a different java version installed
167+
# need to find a way to activate different java versions for <4.0
168+
# and >=4.0
169+
"include": "!=4.0.0",
166170
},
167171
"sqlalchemy": {
168172
"package": "sqlalchemy",

tox.ini

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# The file (and all resulting CI YAMLs) then need to be regenerated via
1111
# "scripts/generate-test-files.sh".
1212
#
13-
# Last generated: 2025-06-03T11:56:46.072665+00:00
13+
# Last generated: 2025-06-03T13:18:52.238209+00:00
1414

1515
[tox]
1616
requires =
@@ -230,8 +230,9 @@ envlist =
230230
{py3.6,py3.11,py3.12}-huey-v2.5.3
231231

232232
{py3.8,py3.9}-spark-v3.0.3
233+
{py3.8,py3.9}-spark-v3.2.4
234+
{py3.8,py3.10,py3.11}-spark-v3.4.4
233235
{py3.8,py3.10,py3.11}-spark-v3.5.6
234-
{py3.9,py3.12,py3.13}-spark-v4.0.0
235236

236237

237238
# ~~~ Web 1 ~~~
@@ -621,8 +622,9 @@ deps =
621622
huey-v2.5.3: huey==2.5.3
622623

623624
spark-v3.0.3: pyspark==3.0.3
625+
spark-v3.2.4: pyspark==3.2.4
626+
spark-v3.4.4: pyspark==3.4.4
624627
spark-v3.5.6: pyspark==3.5.6
625-
spark-v4.0.0: pyspark==4.0.0
626628

627629

628630
# ~~~ Web 1 ~~~

0 commit comments

Comments
 (0)