Skip to content

Commit a113559

Browse files
committed
remove osx-64 platform (non-arm), bump many dependencies, add black to dev env
1 parent 281ec19 commit a113559

2 files changed

Lines changed: 35 additions & 33 deletions

File tree

pixi.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ version = { attr = "libensemble.version.__version__" }
5555

5656
[tool.pixi.workspace]
5757
channels = ["conda-forge"]
58-
platforms = ["osx-arm64", "osx-64", "linux-64"]
58+
platforms = ["osx-arm64", "linux-64"]
5959

6060
[tool.pixi.pypi-dependencies]
6161
libensemble = { path = ".", editable = true }
@@ -81,39 +81,41 @@ py312e = ["py312", "py312e", "basic", "extra"]
8181
py313e = ["py313", "py313e", "basic", "extra"]
8282
py314e = ["py314", "py314e", "basic", "extra"]
8383

84+
8485
# Extra tools for dev environment
8586
[tool.pixi.feature.dev.dependencies]
86-
pre-commit = ">=4.1.0,<5"
87-
git-lfs = ">=3.6.1,<4"
87+
pre-commit = ">=4.5.0,<5"
88+
git-lfs = ">=3.7.1,<4"
89+
black = ">=25.1.0,<26"
8890

8991
# Basic dependencies for basic CI
9092
[tool.pixi.feature.basic.dependencies]
9193
mpi = ">=1.0.1,<2"
92-
mpich = ">=4.0.0,<5"
93-
mpi4py = ">=4.0.3,<5"
94-
scipy = ">=1.13,<2"
94+
mpich = ">=4.3.2,<5"
95+
mpi4py = ">=4.1.1,<5"
96+
scipy = ">=1.15.2,<2"
9597
mpmath = ">=1.3.0,<2"
9698

9799
# "dev" dependencies needed for basic CI
98-
flake8 = ">=7.1.2,<8"
99-
coverage = ">=7.6.12,<8"
100-
pytest = ">=8.3.4,<9"
101-
pytest-cov = ">=6.0.0,<7"
102-
pytest-timeout = ">=2.3.1,<3"
100+
flake8 = ">=7.3.0,<8"
101+
coverage = ">=7.12.0,<8"
102+
pytest = ">=9.0.1,<10"
103+
pytest-cov = ">=7.0.0,<8"
104+
pytest-timeout = ">=2.4.0,<3"
103105
mock = ">=5.2.0,<6"
104106
python-dateutil = ">=2.9.0.post0,<3"
105-
rich = ">=13.9.4,<14"
106-
matplotlib = ">=3.10.1,<4"
107+
rich = ">=14.2.0,<15"
108+
matplotlib = ">=3.10.8,<4"
107109

108110
# Extra dependencies for extra CI
109111
[tool.pixi.feature.extra.dependencies]
110112
superlu_dist = ">=9.0.0,<10"
111113
hypre = ">=2.32.0,<3"
112-
mumps-mpi = ">=5.7.3,<6"
114+
mumps-mpi = ">=5.8.1,<6"
113115
dfo-ls = ">=1.3.0,<2"
114-
petsc = ">=3.23.0,<4"
115-
petsc4py = ">=3.23.0,<4"
116-
ninja = ">=1.13.1,<2" # for building Tasmanian from pypi
116+
petsc = ">=3.24.2,<4"
117+
petsc4py = ">=3.24.2,<4"
118+
ninja = ">=1.13.2,<2" # for building Tasmanian from pypi
117119

118120
[tool.pixi.feature.docs.dependencies]
119121
sphinx = ">=8.2.1,<9"
@@ -133,8 +135,8 @@ types-pyyaml = ">=6.0.12.20250402,<7"
133135

134136
# Linux dependencies, only for extra tests
135137
[tool.pixi.feature.extra.target.linux-64.dependencies]
136-
scikit-build = ">=0.18.1,<0.19"
137-
packaging = ">=25.0,<26"
138+
scikit-build = "*"
139+
packaging = "*"
138140

139141
# Python versions
140142
# nlopt only works up to python 3.13
@@ -180,29 +182,29 @@ pyzmq = ">=26.4.0,<27"
180182
# Dependencies for libEnsemble
181183
[tool.pixi.dependencies]
182184
python = ">=3.10,<3.15"
183-
pip = ">=24.3.1,<25"
184-
setuptools = ">=75.6.0,<76"
185-
numpy = ">=1.21,<3"
186-
pydantic = ">=2,<3"
187-
pyyaml = ">=6.0,<7"
188-
tomli = ">=1.2.1,<3"
189-
psutil = ">=5.9.4,<7"
185+
pip = ">=25.3,<26"
186+
setuptools = ">=80.9.0,<81"
187+
numpy = ">=2.2.6,<3"
188+
pydantic = ">=2.12.5,<3"
189+
pyyaml = ">=6.0.3,<7"
190+
tomli = ">=2.3.0,<3"
191+
psutil = ">=7.1.3,<8"
190192

191193
# macOS dependencies
192194
[tool.pixi.target.osx-arm64.dependencies]
193-
clang_osx-arm64 = ">=21.1.4,<22"
195+
clang_osx-arm64 = ">=21.1.7,<22"
194196

195197
# Linux dependencies
196198
[tool.pixi.target.linux-64.dependencies]
197-
gxx_linux-64 = ">=14.2.0,<15"
199+
gxx_linux-64 = ">=15.2.0,<16"
198200

199201
# Extra dependencies, from pypi
200202
[dependency-groups]
201203
extra = [
202-
"pyenchant",
204+
"pyenchant==3.2.2",
203205
"enchant>=0.0.1,<0.0.2",
204-
"proxystore>=0.7.0",
205-
"redis>=6.0.0,<7",
206+
"proxystore>=0.8.3,<0.9",
207+
"redis>=7.1.0,<8",
206208
"globus-compute-sdk>=2.28.0,<3",
207209
]
208210
dev = ["wat>=0.7.0,<0.8"]

0 commit comments

Comments
 (0)