Skip to content

Commit 5c64440

Browse files
committed
Merge branch 'develop' of https://github.com/Libensemble/libensemble into develop
2 parents 99fd15f + d97a297 commit 5c64440

4 files changed

Lines changed: 22 additions & 22 deletions

File tree

.github/workflows/basic.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,28 @@ jobs:
1818
os: [ubuntu-latest]
1919
mpi-version: [mpich]
2020
python-version: ["3.10", "3.11", "3.12", "3.13"]
21-
pydantic-version: ["2.8.2"]
21+
pydantic-version: ["2.10.6"]
2222
comms-type: [m, l]
2323
include:
2424
- os: macos-latest
2525
python-version: "3.11"
2626
mpi-version: mpich
27-
pydantic-version: "2.8.2"
27+
pydantic-version: "2.10.6"
2828
comms-type: m
2929
- os: macos-latest
3030
python-version: "3.11"
3131
mpi-version: mpich
32-
pydantic-version: "2.8.2"
32+
pydantic-version: "2.10.6"
3333
comms-type: l
3434
- os: ubuntu-latest
3535
mpi-version: mpich
3636
python-version: "3.10"
37-
pydantic-version: "1.10.17"
37+
pydantic-version: "1.10.21"
3838
comms-type: m
3939
- os: ubuntu-latest
4040
mpi-version: mpich
4141
python-version: "3.10"
42-
pydantic-version: "1.10.17"
42+
pydantic-version: "1.10.21"
4343
comms-type: l
4444

4545
env:
@@ -129,4 +129,4 @@ jobs:
129129
runs-on: ubuntu-latest
130130
steps:
131131
- uses: actions/checkout@v4
132-
- uses: crate-ci/typos@v1.29.9
132+
- uses: crate-ci/typos@v1.30.2

.github/workflows/extra.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,38 @@ jobs:
1212
os: [ubuntu-latest]
1313
mpi-version: [mpich]
1414
python-version: ['3.10', '3.11', '3.12', '3.13']
15-
pydantic-version: ['2.8.2']
15+
pydantic-version: ['2.10.6']
1616
comms-type: [m, l]
1717
include:
1818
- os: macos-latest
1919
python-version: '3.13'
2020
mpi-version: mpich
21-
pydantic-version: '2.8.2'
21+
pydantic-version: '2.10.6'
2222
comms-type: m
2323
- os: macos-latest
2424
python-version: '3.13'
2525
mpi-version: mpich
26-
pydantic-version: '2.8.2'
26+
pydantic-version: '2.10.6'
2727
comms-type: l
2828
- os: ubuntu-latest
2929
python-version: '3.12'
3030
mpi-version: mpich
31-
pydantic-version: '2.8.2'
31+
pydantic-version: '2.10.6'
3232
comms-type: t
3333
- os: ubuntu-latest
3434
mpi-version: 'openmpi'
35-
pydantic-version: '2.8.2'
35+
pydantic-version: '2.10.6'
3636
python-version: '3.12'
3737
comms-type: l
3838
- os: ubuntu-latest
3939
mpi-version: mpich
4040
python-version: '3.12'
41-
pydantic-version: '1.10.17'
41+
pydantic-version: '1.10.21'
4242
comms-type: m
4343
- os: ubuntu-latest
4444
mpi-version: mpich
4545
python-version: '3.12'
46-
pydantic-version: '1.10.17'
46+
pydantic-version: '1.10.21'
4747
comms-type: l
4848

4949
env:
@@ -111,7 +111,7 @@ jobs:
111111
pip install scikit-build packaging
112112
113113
- name: Install Balsam on Pydantic 1
114-
if: matrix.pydantic-version == '1.10.17'
114+
if: matrix.pydantic-version == '1.10.21'
115115
run: |
116116
conda install pyzmq
117117
git clone https://github.com/argonne-lcf/balsam.git
@@ -139,18 +139,18 @@ jobs:
139139
rm ./libensemble/tests/regression_tests/test_gpCAM.py # needs gpcam, which doesn't build on 3.13
140140
141141
- name: Install redis/proxystore on Pydantic 2
142-
if: matrix.pydantic-version == '2.8.2'
142+
if: matrix.pydantic-version == '2.10.6'
143143
run: |
144144
pip install redis
145145
pip install proxystore==0.7.0
146146
147147
- name: Remove proxystore test on Pydantic 1
148-
if: matrix.pydantic-version == '1.10.17'
148+
if: matrix.pydantic-version == '1.10.21'
149149
run: |
150150
rm ./libensemble/tests/regression_tests/test_proxystore_integration.py
151151
152152
- name: Remove Balsam/Globus-compute tests on Pydantic 2
153-
if: matrix.pydantic-version == '2.8.2'
153+
if: matrix.pydantic-version == '2.10.6'
154154
run: |
155155
rm ./libensemble/tests/unit_tests/test_ufunc_runners.py
156156
rm ./libensemble/tests/unit_tests/test_executor_balsam.py
@@ -180,4 +180,4 @@ jobs:
180180
runs-on: ubuntu-latest
181181
steps:
182182
- uses: actions/checkout@v4
183-
- uses: crate-ci/typos@v1.29.9
183+
- uses: crate-ci/typos@v1.30.2

install/testing_requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
flake8==7.1.2
22
coverage>=7.5
3-
pytest==8.3.4
3+
pytest==8.3.5
44
pytest-cov==6.0.0
55
pytest-timeout==2.3.1
6-
mock==5.1.0
6+
mock==5.2.0
77
python-dateutil==2.9.0.post0
88
anyio==4.8.0
9-
matplotlib==3.10.0
9+
matplotlib==3.10.1
1010
mpmath==1.3.0
1111
rich==13.9.4

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Issues = "https://github.com/Libensemble/libensemble/issues"
3939

4040
[build-system]
4141
build-backend = "setuptools.build_meta"
42-
requires = ["setuptools", "wheel", "pip>=24.3.1,<26", "setuptools>=75.1.0,<76", ]
42+
requires = ["setuptools", "wheel", "pip>=24.3.1,<26", "setuptools>=75.1.0,<77", ]
4343

4444
[tool.setuptools.packages.find]
4545
where = ["."]

0 commit comments

Comments
 (0)