Skip to content

Commit ba92146

Browse files
committed
Merge branch 'develop' into dependabot/pip/develop/python-updates-294088a0b4
2 parents c5ae92b + 16af204 commit ba92146

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/basic.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
miniconda-version: "latest"
6161
python-version: ${{ matrix.python-version }}
6262
channels: conda-forge
63-
channel-priority: flexible
63+
channel-priority: strict
6464
auto-update-conda: true
6565

6666
- name: Force-update certifi and pip
@@ -72,7 +72,7 @@ jobs:
7272
- name: Install Ubuntu compilers
7373
if: matrix.os == 'ubuntu-latest'
7474
run: |
75-
conda install gcc_linux-64
75+
conda install -c conda-forge gcc_linux-64
7676
pip install nlopt==2.9.0
7777
7878
# Roundabout solution on macos for proper linking with mpicc
@@ -129,4 +129,4 @@ jobs:
129129
runs-on: ubuntu-latest
130130
steps:
131131
- uses: actions/checkout@v4
132-
- uses: crate-ci/typos@v1.33.1
132+
- uses: crate-ci/typos@v1.34.0

.github/workflows/extra.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
miniconda-version: 'latest'
6565
python-version: ${{ matrix.python-version }}
6666
channels: conda-forge
67-
channel-priority: flexible
67+
channel-priority: strict
6868
auto-update-conda: true
6969

7070
- name: Force-update certifi
@@ -75,7 +75,7 @@ jobs:
7575
- name: Install Ubuntu compilers
7676
if: matrix.os == 'ubuntu-latest'
7777
run: |
78-
conda install gcc_linux-64
78+
conda install -c conda-forge gcc_linux-64
7979
pip install nlopt==2.9.0
8080
8181
# Roundabout solution on macos for proper linking with mpicc
@@ -96,7 +96,7 @@ jobs:
9696
- name: Install gpcam and octave # Neither yet support 3.13
9797
if: matrix.python-version <= '3.12'
9898
run: |
99-
pip install gpcam
99+
pip install gpcam==8.1.13
100100
conda install octave
101101
102102
- name: Install surmise and Tasmanian
@@ -180,4 +180,4 @@ jobs:
180180
runs-on: ubuntu-latest
181181
steps:
182182
- uses: actions/checkout@v4
183-
- uses: crate-ci/typos@v1.33.1
183+
- uses: crate-ci/typos@v1.34.0

install/gen_deps_environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ dependencies:
1212
- mumps-mpi
1313
- DFO-LS
1414
- mpmath
15-
- ax-platform>=0.5.0
15+
- ax-platform==0.5.0
1616
- petsc
1717
- petsc4py

0 commit comments

Comments
 (0)