Skip to content

Commit 5d56011

Browse files
authored
Merge pull request #1488 from Libensemble/release/v_1.4.3
Release/v 1.4.3
2 parents 2892c86 + 5c2f997 commit 5d56011

66 files changed

Lines changed: 901 additions & 3430 deletions

Some content is hidden

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

.flake8

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ exclude =
1414
# Keeping bad python format to match PETSc source code
1515
libensemble/sim_funcs/chwirut1.py
1616
examples/sim_funcs/chwirut1.py
17+
# test runner
18+
libensemble/tests/run_tests.py
1719

1820
# Note that you can use wildcard exceptions with something such as
1921
# libensemble/libensemble/tests/regression_tests/*:F401
@@ -39,7 +41,6 @@ per-file-ignores =
3941
examples/calling_scripts/run_libensemble_on_warpx.py:E402
4042
libensemble/tests/regression_tests/test_persistent_aposmm*:E402
4143
libensemble/tests/regression_tests/test_persistent_gp_multitask_ax.py:E402
42-
libensemble/tests/regression_tests/test_ytopt_heffte.py:E402
4344
libensemble/tests/functionality_tests/test_uniform_sampling_then_persistent_localopt_runs.py:E402
4445
libensemble/tests/functionality_tests/test_stats_output.py:E402
4546
libensemble/tests/functionality_tests/test_active_persistent_worker_abort.py:E402

.github/dependabot.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,30 @@ updates:
1010
- package-ecosystem: github-actions
1111
directory: /
1212
schedule:
13-
interval: daily
13+
interval: weekly # Reduced frequency
1414
target-branch: "develop"
15+
groups:
16+
actions-updates:
17+
patterns:
18+
- "actions/*"
1519

1620
- package-ecosystem: pip
1721
directory: /
1822
schedule:
19-
interval: daily
23+
interval: weekly # Reduced frequency
2024
target-branch: "develop"
25+
groups:
26+
python-updates:
27+
patterns:
28+
- "*"
2129

2230
- package-ecosystem: gitsubmodule
2331
directory: /
2432
schedule:
25-
interval: daily
33+
interval: weekly # Reduced frequency
2634
target-branch: "develop"
35+
groups:
36+
submodule-updates:
37+
patterns:
38+
- "*"
39+

.github/workflows/basic.yml

Lines changed: 20 additions & 54 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"]
21-
pydantic-version: ["2.6.4"]
20+
python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
21+
pydantic-version: ["2.8.2"]
2222
comms-type: [m, l]
2323
include:
2424
- os: macos-latest
2525
python-version: "3.11"
2626
mpi-version: mpich
27-
pydantic-version: "2.6.4"
27+
pydantic-version: "2.8.2"
2828
comms-type: m
2929
- os: macos-latest
3030
python-version: "3.11"
3131
mpi-version: mpich
32-
pydantic-version: "2.6.4"
32+
pydantic-version: "2.8.2"
3333
comms-type: l
3434
- os: ubuntu-latest
3535
mpi-version: mpich
3636
python-version: "3.10"
37-
pydantic-version: "1.10.13"
37+
pydantic-version: "1.10.17"
3838
comms-type: m
3939
- os: ubuntu-latest
4040
mpi-version: mpich
4141
python-version: "3.10"
42-
pydantic-version: "1.10.13"
42+
pydantic-version: "1.10.17"
4343
comms-type: l
4444

4545
env:
@@ -63,71 +63,37 @@ jobs:
6363
channel-priority: flexible
6464
auto-update-conda: true
6565

66-
- uses: actions/cache/restore@v4
67-
name: Restore cached dependencies
68-
id: cache
69-
if: matrix.os == 'ubuntu-latest'
70-
with:
71-
path: |
72-
/home/runner/.local
73-
/usr/share/miniconda3/envs/condaenv
74-
/usr/share/miniconda3/bin
75-
/usr/share/miniconda3/lib
76-
/usr/share/miniconda3/include
77-
key: libe-${{ github.ref_name }}-${{ matrix.python-version }}-${{ matrix.comms-type }}-${{ matrix.pydantic-version }}-basic
78-
79-
- name: Force-update certifi
66+
- name: Force-update certifi and pip
8067
run: |
8168
python --version
82-
pip install -I --upgrade certifi
69+
python -m pip install --upgrade pip
70+
python -m pip install -I --upgrade certifi
8371
8472
- name: Install Ubuntu compilers
8573
if: matrix.os == 'ubuntu-latest'
86-
run: conda install gcc_linux-64
74+
run: |
75+
conda install gcc_linux-64
76+
pip install nlopt==2.9.0
8777
8878
# Roundabout solution on macos for proper linking with mpicc
8979
- name: Install macOS compilers
9080
if: matrix.os == 'macos-latest'
9181
run: |
9282
conda install clang_osx-64
83+
pip install nlopt==2.8.0
9384
9485
- name: Install basic testing/feature dependencies
9586
run: |
9687
pip install -r install/testing_requirements.txt
9788
pip install -r install/misc_feature_requirements.txt
98-
99-
git clone --recurse-submodules -b develop https://github.com/POptUS/IBCDFO.git
100-
pushd IBCDFO/minq/py/minq5/
101-
export PYTHONPATH="$PYTHONPATH:$(pwd)"
102-
echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV
103-
popd
104-
pushd IBCDFO/ibcdfo_pypkg/
105-
pip install -e .
106-
popd
89+
source install/install_ibcdfo.sh
90+
conda install numpy scipy
10791
10892
- name: Install mpi4py and MPI from conda
10993
run: |
11094
conda install mpi4py ${{ matrix.mpi-version }}
11195
112-
- name: Install generator dependencies
113-
run: |
114-
python -m pip install --upgrade pip
115-
pip install mpmath matplotlib
116-
conda install numpy nlopt scipy
117-
118-
- uses: actions/cache/save@v4
119-
name: Save dependencies to cache
120-
if: matrix.os == 'ubuntu-latest'
121-
with:
122-
path: |
123-
/home/runner/.local
124-
/usr/share/miniconda3/envs/condaenv
125-
/usr/share/miniconda3/bin
126-
/usr/share/miniconda3/lib
127-
/usr/share/miniconda3/include
128-
key: libe-${{ github.ref_name }}-${{ matrix.python-version }}-${{ matrix.comms-type }}
129-
130-
- name: Install libEnsemble, flake8
96+
- name: Install libEnsemble, test flake8
13197
run: |
13298
pip install pydantic==${{ matrix.pydantic-version }}
13399
pip install -e .
@@ -141,19 +107,19 @@ jobs:
141107
- name: Run simple tests, Ubuntu
142108
if: matrix.os == 'ubuntu-latest'
143109
run: |
144-
./libensemble/tests/run-tests.sh -A "-W error" -z -${{ matrix.comms-type }}
110+
./libensemble/tests/run_tests.py -A "-W error" -${{ matrix.comms-type }}
145111
146112
- name: Run simple tests, macOS
147113
if: matrix.os == 'macos-latest'
148114
run: |
149-
./libensemble/tests/run-tests.sh -A "-W error" -z -${{ matrix.comms-type }}
115+
./libensemble/tests/run_tests.py -A "-W error" -${{ matrix.comms-type }}
150116
151117
- name: Merge coverage
152118
run: |
153119
mv libensemble/tests/.cov* .
154120
155121
- name: Upload coverage reports to Codecov
156-
uses: codecov/codecov-action@v4
122+
uses: codecov/codecov-action@v5
157123
env:
158124
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
159125

@@ -163,4 +129,4 @@ jobs:
163129
runs-on: ubuntu-latest
164130
steps:
165131
- uses: actions/checkout@v4
166-
- uses: crate-ci/typos@v1.23.6
132+
- uses: crate-ci/typos@v1.28.2

0 commit comments

Comments
 (0)