Skip to content

adds PySpark 4.0.0 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

adds PySpark 4.0.0 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5953302
adds PySpark 4.0.0
cbaycity Aug 17, 2025
1dedd7c
use Python 3.12 to test PySpark 4.0.0
cbaycity Aug 22, 2025
d9e5335
merging with main
cbaycity Oct 12, 2025
a22887c
Merge branch 'main' into pyspark4.0.0
cbaycity Oct 17, 2025
1172576
current work save
cbaycity Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,27 @@ def is_arm_mac():


DEPENDENCY_MATRIX = [
DependencyConfiguration(
id="3.10-oldest",
python="3.10",
packages={
"pyspark[sql]": "==3.3.1" if not is_mac() else "==3.5.0",
"sympy": "==1.8",
"pandas": "==1.4.0",
"numpy": "==1.23.2",
"scipy": "==1.8.0",
"randomgen": "==1.23.0",
"pyarrow": "==14.0.1",
},
),
#DependencyConfiguration(
# id="3.10-oldest",
# python="3.10",
# packages={
# "pyspark[sql]": "==3.3.1" if not is_mac() else "==3.5.0",
# "sympy": "==1.8",
# "pandas": "==1.4.0",
# "numpy": "==1.23.2",
# "scipy": "==1.8.0",
# "randomgen": "==1.23.0",
# "pyarrow": "==14.0.1",
# },
#),
DependencyConfiguration(
id="3.10-newest",
python="3.10",
packages={
"pyspark[sql]": "==3.5.6",
"sympy": "==1.9",
"pandas": "==1.5.3",
"numpy": "==1.26.4",
"pyspark[sql]": "==4.0.1",
"sympy": "==1.12",
"pandas": "==2.3.3",
"numpy": "==2.2.6",
"scipy": "==1.14.1",
"randomgen": "==1.26.0",
"pyarrow": "==16.1.0",
Expand All @@ -90,10 +90,10 @@ def is_arm_mac():
id="3.11-newest",
python="3.11",
packages={
"pyspark[sql]": "==3.5.6",
"sympy": "==1.9",
"pandas": "==1.5.3",
"numpy": "==1.26.4",
"pyspark[sql]": "==4.0.1",
"sympy": "==1.12",
"pandas": "==2.3.3",
"numpy": "==2.2.6",
"scipy": "==1.14.1",
"randomgen": "==1.26.1",
"pyarrow": "==16.1.0",
Expand All @@ -117,10 +117,10 @@ def is_arm_mac():
id="3.12-newest",
python="3.12",
packages={
"pyspark[sql]": "==3.5.6",
"sympy": "==1.9",
"pandas": "==2.2.2",
"numpy": "==1.26.4",
"pyspark[sql]": "==4.0.1",
"sympy": "==1.12",
"pandas": "==2.3.3",
"numpy": "==2.2.6",
"scipy": "==1.14.1",
"randomgen": "==1.26.1",
"pyarrow": "==16.1.0",
Expand Down
22 changes: 14 additions & 8 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ keywords = [

requires-python = ">=3.10,<3.13"
dependencies = [
"numpy >=1.23.2,<2 ; python_version < '3.12'",
"numpy >=1.26.0,<2 ; python_version >= '3.12'",
"pandas >=1.4.0,<2 ; python_version < '3.11'",
"pandas >=1.5.0,<2 ; python_version == '3.11'",
"numpy >=1.23.2,<=2.2.6 ; python_version < '3.12'",
"numpy >=1.26.0,<=2.2.6 ; python_version >= '3.12'",
"pandas >=1.4.0,<3 ; python_version < '3.11'",
"pandas >=1.5.0,<3 ; python_version == '3.11'",
"pandas >=2.2.0,<3 ; python_version >= '3.12'",
"pyarrow >=18.0.0,<19",
"pyspark[sql] >=3.3.1,<3.6 ; python_version < '3.11' and sys_platform != 'darwin'",
"pyspark[sql] >=3.4.0,<3.6 ; python_version == '3.11' and sys_platform != 'darwin'",
"pyspark[sql] >=3.5.0,<3.6 ; python_version >= '3.12' and sys_platform != 'darwin'",
"pyspark[sql] >=3.5.0,<3.6 ; sys_platform == 'darwin'",
"pyspark[sql] >=3.3.1,<5 ; python_version < '3.11' and sys_platform != 'darwin'",
"pyspark[sql] >=3.4.0,<5 ; python_version == '3.11' and sys_platform != 'darwin'",
"pyspark[sql] >=3.5.0,<5; python_version >= '3.12' and sys_platform != 'darwin'",
"pyspark[sql] >=3.5.0,<5 ; sys_platform == 'darwin'",
"randomgen >=1.20.0,<=1.26.0 ; python_version < '3.10'",
"randomgen >=1.23.0,<=1.26.0 ; python_version == '3.10'",
"randomgen >=1.26.0,<=2 ; python_version >= '3.11'",
Expand Down Expand Up @@ -99,6 +99,12 @@ scripting = [
"nox >=2024.03.02",
"tmlt.nox_utils"
]
dev = [
"ruff>=0.5.0", # Added to support numpy migration.
]

[tool.ruff.lint]
select = ["NPY201"]

[tool.uv.sources]
# Switch which of these is commented out to test local changes to nox-utils:
Expand Down
1 change: 1 addition & 0 deletions src/tmlt/core/random/rng.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import numpy as np
from randomgen.rdrand import RDRAND # pylint: disable=no-name-in-module
from randomgen.wrapper import UserBitGenerator # pylint: disable=no-name-in-module
"""Can this be switched to something else to avoid import errors?"""

try:
_core_privacy_prng = np.random.Generator(RDRAND())
Expand Down
99 changes: 87 additions & 12 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.