Skip to content

Commit c9a5140

Browse files
authored
Merge pull request #1545 from Libensemble/release/v_1.5.0
Release/v 1.5.0
2 parents 5d56011 + 5e040d1 commit c9a5140

File tree

219 files changed

+2864
-1324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+2864
-1324
lines changed

.black

Lines changed: 0 additions & 12 deletions
This file was deleted.

.codecov.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ ignore:
33
- "libensemble/tools/forkable_pdb.py"
44
- "libensemble/tools/live_data/*"
55
- "libensemble/sim_funcs/executor_hworld.py"
6-
- "libensemble/gen_funcs/persistent_ax_multitask.py"
7-
- "libensemble/gen_funcs/persistent_gpCAM.py"
6+
- "libensemble/gen_funcs/persistent_tasmanian.py"

.flake8

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,3 @@ per-file-ignores =
4646
libensemble/tests/functionality_tests/test_active_persistent_worker_abort.py:E402
4747
libensemble/tests/unit_tests/test_persistent_aposmm.py:E402
4848
libensemble/tests/unit_tests/RENAME_test_persistent_aposmm.py:E402
49-
50-
# Allow undefined name '__version__'
51-
setup.py:F821

.github/dependabot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,3 @@ updates:
3636
submodule-updates:
3737
patterns:
3838
- "*"
39-

.github/workflows/basic.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@ jobs:
1717
matrix:
1818
os: [ubuntu-latest]
1919
mpi-version: [mpich]
20-
python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
21-
pydantic-version: ["2.8.2"]
20+
python-version: ["3.10", "3.11", "3.12", "3.13"]
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.28.2
132+
- uses: crate-ci/typos@v1.31.1

.github/workflows/extra.yml

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,43 @@ jobs:
1111
matrix:
1212
os: [ubuntu-latest]
1313
mpi-version: [mpich]
14-
python-version: [3.9, "3.10", "3.11", "3.12"]
15-
pydantic-version: ["2.8.2"]
14+
python-version: ['3.10', '3.11', '3.12', '3.13']
15+
pydantic-version: ['2.10.6']
1616
comms-type: [m, l]
1717
include:
1818
- os: macos-latest
19-
python-version: 3.11
19+
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
24-
python-version: 3.11
24+
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
29-
python-version: "3.10"
29+
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
34-
mpi-version: "openmpi"
35-
pydantic-version: "2.8.2"
36-
python-version: "3.12"
34+
mpi-version: 'openmpi'
35+
pydantic-version: '2.10.6'
36+
python-version: '3.12'
3737
comms-type: l
3838
- os: ubuntu-latest
3939
mpi-version: mpich
40-
python-version: "3.10"
41-
pydantic-version: "1.10.17"
40+
python-version: '3.12'
41+
pydantic-version: '1.10.21'
4242
comms-type: m
4343
- os: ubuntu-latest
4444
mpi-version: mpich
45-
python-version: "3.10"
46-
pydantic-version: "1.10.17"
45+
python-version: '3.12'
46+
pydantic-version: '1.10.21'
4747
comms-type: l
4848

4949
env:
50-
HYDRA_LAUNCHER: "fork"
50+
HYDRA_LAUNCHER: 'fork'
5151
TERM: xterm-256color
5252
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5353

@@ -61,7 +61,7 @@ jobs:
6161
uses: conda-incubator/setup-miniconda@v3
6262
with:
6363
activate-environment: condaenv
64-
miniconda-version: "latest"
64+
miniconda-version: 'latest'
6565
python-version: ${{ matrix.python-version }}
6666
channels: conda-forge
6767
channel-priority: flexible
@@ -75,8 +75,8 @@ jobs:
7575
- name: Install Ubuntu compilers
7676
if: matrix.os == 'ubuntu-latest'
7777
run: |
78-
conda install gcc_linux-64
79-
pip install nlopt==2.9.0
78+
conda install gcc_linux-64
79+
pip install nlopt==2.9.0
8080
8181
# Roundabout solution on macos for proper linking with mpicc
8282
- name: Install macOS compilers
@@ -93,25 +93,25 @@ jobs:
9393
run: |
9494
conda env update --file install/gen_deps_environment.yml
9595
96-
- name: Install gpcam
97-
if: matrix.python-version != '3.12'
96+
- name: Install gpcam and octave # Neither yet support 3.13
97+
if: matrix.python-version <= '3.12'
9898
run: |
9999
pip install gpcam
100+
conda install octave
100101
101-
- name: Install surmise
102+
- name: Install surmise and Tasmanian
102103
if: matrix.os == 'ubuntu-latest'
103104
run: |
104105
pip install --upgrade git+https://github.com/bandframework/surmise.git
106+
pip install Tasmanian --user
105107
106108
- name: Install generator dependencies for Ubuntu tests
107-
if: matrix.os == 'ubuntu-latest' && matrix.python-version != '3.12'
109+
if: matrix.os == 'ubuntu-latest' && matrix.python-version <= '3.12'
108110
run: |
109-
sudo apt-get install bc
110-
pip install -r install/ubuntu_no312.txt
111-
pip install Tasmanian --user
111+
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
@@ -120,38 +120,37 @@ jobs:
120120
121121
- name: Install other testing dependencies
122122
run: |
123-
conda install octave
124123
pip install -r install/testing_requirements.txt
125124
pip install -r install/misc_feature_requirements.txt
126125
source install/install_ibcdfo.sh
126+
conda install numpy scipy
127127
128128
- name: Install libEnsemble, flake8, lock environment
129129
run: |
130130
pip install pydantic==${{ matrix.pydantic-version }}
131131
pip install -e .
132132
flake8 libensemble
133133
134-
- name: Remove test for persistent Tasmanian, Surmise on Python 3.12
135-
if: matrix.python-version >= '3.12'
134+
- name: Remove test using octave, gpcam on Python 3.13
135+
if: matrix.python-version >= '3.13'
136136
run: |
137-
rm ./libensemble/tests/regression_tests/test_persistent_tasmanian.py
138-
rm ./libensemble/tests/regression_tests/test_persistent_tasmanian_async.py
139-
rm ./libensemble/tests/regression_tests/test_persistent_surmise_calib.py
140-
rm ./libensemble/tests/regression_tests/test_persistent_surmise_killsims.py
137+
rm ./libensemble/tests/regression_tests/test_persistent_fd_param_finder.py # needs octave, which doesn't yet support 3.13
138+
rm ./libensemble/tests/regression_tests/test_persistent_aposmm_external_localopt.py # needs octave, which doesn't yet support 3.13
139+
rm ./libensemble/tests/regression_tests/test_gpCAM.py # needs gpcam, which doesn't build on 3.13
141140
142141
- name: Install redis/proxystore on Pydantic 2
143-
if: matrix.pydantic-version == '2.8.2'
142+
if: matrix.pydantic-version == '2.10.6'
144143
run: |
145144
pip install redis
146145
pip install proxystore==0.7.0
147146
148147
- name: Remove proxystore test on Pydantic 1
149-
if: matrix.pydantic-version == '1.10.17'
148+
if: matrix.pydantic-version == '1.10.21'
150149
run: |
151150
rm ./libensemble/tests/regression_tests/test_proxystore_integration.py
152151
153152
- name: Remove Balsam/Globus-compute tests on Pydantic 2
154-
if: matrix.pydantic-version == '2.8.2'
153+
if: matrix.pydantic-version == '2.10.6'
155154
run: |
156155
rm ./libensemble/tests/unit_tests/test_ufunc_runners.py
157156
rm ./libensemble/tests/unit_tests/test_executor_balsam.py
@@ -181,4 +180,4 @@ jobs:
181180
runs-on: ubuntu-latest
182181
steps:
183182
- uses: actions/checkout@v4
184-
- uses: crate-ci/typos@v1.28.2
183+
- uses: crate-ci/typos@v1.31.1

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ dist/
2626
.spyproject/
2727

2828
.hypothesis
29+
.pixi

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.4.0
3+
rev: v5.0.0
44
hooks:
55
- id: end-of-file-fixer
66
exclude: ^(.*\.xml|.*\.svg)$
77
- id: trailing-whitespace
88
exclude: ^(.*\.xml|.*\.svg)$
99

1010
- repo: https://github.com/pycqa/isort
11-
rev: 5.12.0
11+
rev: 6.0.0
1212
hooks:
1313
- id: isort
1414
args: [--profile=black, --line-length=120]
1515

1616
- repo: https://github.com/psf/black
17-
rev: 22.12.0
17+
rev: 25.1.0
1818
hooks:
1919
- id: black
2020
args: [--line-length=120]
2121

2222
- repo: https://github.com/PyCQA/flake8
23-
rev: 6.0.0
23+
rev: 7.1.1
2424
hooks:
2525
- id: flake8
2626
args: [--max-line-length=120]
2727

2828
- repo: https://github.com/asottile/blacken-docs
29-
rev: v1.12.1
29+
rev: 1.19.1
3030
hooks:
3131
- id: blacken-docs
3232
additional_dependencies: [black==22.12.0]

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
build:
44
os: "ubuntu-22.04"
55
tools:
6-
python: "3.9"
6+
python: "3.10"
77

88
sphinx:
99
configuration: docs/conf.py

.typos.toml

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)