Skip to content

Commit 6a7bbe5

Browse files
authored
Merge maint16_3 into maint16_4
2 parents dac782e + 02b452b commit 6a7bbe5

9 files changed

Lines changed: 22 additions & 18 deletions

File tree

.github/workflows/lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: clang-format
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
- name: Run clang-format style check for C/C++
2222
uses: jidicula/clang-format-action@v4.15.0
2323
with:
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
- name: Install dependencies
3434
run: |
3535
sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc
@@ -45,14 +45,14 @@ jobs:
4545
runs-on: ubuntu-latest
4646
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
4747
steps:
48-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4949
- uses: chartboost/ruff-action@v1
5050

5151
flake8:
5252
runs-on: ubuntu-latest
5353
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
5454
steps:
55-
- uses: actions/checkout@v5
55+
- uses: actions/checkout@v6
5656
- uses: actions/setup-python@v6
5757
with:
5858
python-version: "3.12"
@@ -62,7 +62,7 @@ jobs:
6262
runs-on: ubuntu-latest
6363
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
6464
steps:
65-
- uses: actions/checkout@v5
65+
- uses: actions/checkout@v6
6666
- name: Setup Python
6767
uses: actions/setup-python@v6
6868
with:

.github/workflows/osxbinary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: macos-14
1717
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
- name: Install dependencies
2121
run: |
2222
brew install automake autoconf

.github/workflows/python.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
python-version: ['3.9', '3.13']
2222

2323
steps:
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
- name: Set up Python ${{ matrix.python-version }}
2626
uses: actions/setup-python@v6
2727
with:
@@ -48,7 +48,7 @@ jobs:
4848
python-version: ['3.13']
4949

5050
steps:
51-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v6
5252
- name: Set up Python ${{ matrix.python-version }}
5353
uses: actions/setup-python@v6
5454
with:
@@ -71,7 +71,7 @@ jobs:
7171
python-version: ['3.13']
7272

7373
steps:
74-
- uses: actions/checkout@v4
74+
- uses: actions/checkout@v6
7575
- name: Set up Python ${{ matrix.python-version }}
7676
uses: actions/setup-python@v6
7777
with:
@@ -94,7 +94,7 @@ jobs:
9494
python-version: ['3.13']
9595

9696
steps:
97-
- uses: actions/checkout@v5
97+
- uses: actions/checkout@v6
9898
- name: Set up Python ${{ matrix.python-version }}
9999
uses: actions/setup-python@v6
100100
with:

.github/workflows/tools.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
- name: Install dependencies
2222
run: |
2323
sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: macos-14
4545
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
4646
steps:
47-
- uses: actions/checkout@v5
47+
- uses: actions/checkout@v6
4848
- name: Install dependencies
4949
run: brew install automake autoconf wxwidgets
5050
- run: aclocal
@@ -63,7 +63,7 @@ jobs:
6363
runs-on: macos-15
6464
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
6565
steps:
66-
- uses: actions/checkout@v5
66+
- uses: actions/checkout@v6
6767
- name: Install dependencies
6868
run: brew install automake autoconf wxwidgets
6969
- run: aclocal
@@ -85,7 +85,7 @@ jobs:
8585
run:
8686
shell: msys2 {0}
8787
steps:
88-
- uses: actions/checkout@v5
88+
- uses: actions/checkout@v6
8989
- uses: msys2/setup-msys2@v2
9090
with:
9191
install: mingw-w64-x86_64-toolchain make automake autoconf

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: windows-latest
1818

1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
- name: Set up Python
2222
uses: actions/setup-python@v6
2323
with:

ChangeLog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
mixed behavior profiles (#616)
1616

1717

18-
## [16.3.2] - unreleased
18+
## [16.3.2] - 2025-12-04
1919

2020
### Fixed
2121
- Parsing of output of `gambit-logit` in the graphical interface did not handle the

doc/tools.lcp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ computes Nash equilibria by finding solutions to a linear
99
complementarity problem. For extensive games, the program uses the
1010
sequence form representation of the extensive game, as defined by
1111
Koller, Megiddo, and von Stengel [KolMegSte94]_, and applies the
12-
algorithm developed by Lemke. For strategic games, the program using
12+
algorithm developed by Lemke. For strategic games, the program uses
1313
the method of Lemke and Howson [LemHow64]_. There exist strategic
1414
games for which some equilibria cannot be located by this method; see
1515
Shapley [Sha74]_.

src/gui/gameframe.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,10 @@ void gbtGameFrame::MakeMenus()
489489

490490
viewMenu->Append(GBT_MENU_VIEW_STRATEGIC, _("&Strategic game"),
491491
wxT("Display the reduced strategic representation ") wxT("of the game"), true);
492+
if (!m_doc->GetGame()->IsTree()) {
493+
viewMenu->Check(GBT_MENU_VIEW_STRATEGIC, true);
494+
viewMenu->Enable(GBT_MENU_VIEW_STRATEGIC, false);
495+
}
492496

493497
auto *formatMenu = new wxMenu;
494498
AppendBitmapItem(formatMenu, GBT_MENU_FORMAT_LAYOUT, _("&Layout"),

src/pygambit/game.pxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ class Game:
14881488
except KeyError:
14891489
raise KeyError(f"{funcname}(): no information set with label '{infoset}'")
14901490
raise TypeError(
1491-
f"{funcname}(): {argname} must be Infoset or str, not {node.__class__.__name__}"
1491+
f"{funcname}(): {argname} must be Infoset or str, not {infoset.__class__.__name__}"
14921492
)
14931493

14941494
def _resolve_action(self,

0 commit comments

Comments
 (0)