Skip to content

Commit 7813a60

Browse files
tturocytturocy
committed
Merge branch 'maint16_3' into merge_163_164
# Conflicts: # .github/workflows/osxbinary.yml # .github/workflows/tools.yml # ChangeLog # setup.py # src/pygambit/outcome.pxi
2 parents 6436ed3 + ddc8cd2 commit 7813a60

25 files changed

Lines changed: 74 additions & 53 deletions

‎.github/workflows/lint.yml‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: clang-format
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- name: Run clang-format style check for C/C++
1414
uses: jidicula/clang-format-action@v4.15.0
1515
with:
@@ -21,19 +21,12 @@ jobs:
2121
runs-on: ubuntu-latest
2222
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- name: Install dependencies
2626
run: |
2727
sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc
28-
sudo apt-add-repository 'deb https://repos.codelite.org/wx3.1.5/ubuntu/ focal universe'
2928
sudo apt-get update
30-
sudo apt-get install -y automake autoconf clang-tidy
31-
sudo apt-get install -y libwxbase3.1-0-unofficial \
32-
libwxbase3.1unofficial-dev \
33-
libwxgtk3.1-0-unofficial \
34-
libwxgtk3.1unofficial-dev \
35-
wx3.1-headers \
36-
wx-common
29+
sudo apt-get install -y automake autoconf libwxgtk3.2-dev clang-tidy
3730
- run: aclocal
3831
- run: automake --add-missing
3932
- run: autoconf
@@ -44,14 +37,14 @@ jobs:
4437
runs-on: ubuntu-latest
4538
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
4639
steps:
47-
- uses: actions/checkout@v4
40+
- uses: actions/checkout@v5
4841
- uses: chartboost/ruff-action@v1
4942

5043
flake8:
5144
runs-on: ubuntu-latest
5245
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
5346
steps:
54-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v5
5548
- uses: actions/setup-python@v5
5649
with:
5750
python-version: "3.12"
@@ -61,7 +54,7 @@ jobs:
6154
runs-on: ubuntu-latest
6255
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
6356
steps:
64-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v5
6558
- name: Setup Python
6659
uses: actions/setup-python@v5
6760
with:

‎.github/workflows/osxbinary.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: macos-13
1313
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- name: Install dependencies
1717
run: |
1818
brew install automake autoconf

‎.github/workflows/python.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
python-version: ['3.9', '3.13']
1414

1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
- name: Set up Python ${{ matrix.python-version }}
1818
uses: actions/setup-python@v5
1919
with:
@@ -86,7 +86,7 @@ jobs:
8686
python-version: ['3.13']
8787

8888
steps:
89-
- uses: actions/checkout@v4
89+
- uses: actions/checkout@v5
9090
- name: Set up Python ${{ matrix.python-version }}
9191
uses: actions/setup-python@v5
9292
with:

‎.github/workflows/tools.yml‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- name: Install dependencies
1414
run: |
1515
sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc
16-
sudo apt-add-repository 'deb https://repos.codelite.org/wx3.1.5/ubuntu/ focal universe'
1716
sudo apt-get update
18-
sudo apt-get install -y automake autoconf
19-
sudo apt-get install -y libwxgtk3.2-dev
17+
sudo apt-get install -y automake autoconf libwxgtk3.2-dev
2018
- name: Configure build with autotools
2119
run: |
2220
aclocal
@@ -35,10 +33,10 @@ jobs:
3533
sudo make install
3634
3735
macos:
38-
runs-on: macos-latest
36+
runs-on: macos-13
3937
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
4038
steps:
41-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v5
4240
- name: Install dependencies
4341
run: brew install automake autoconf wxwidgets
4442
- run: aclocal
@@ -50,7 +48,26 @@ jobs:
5048
- run: make osx-dmg
5149
- uses: actions/upload-artifact@v4
5250
with:
53-
name: artifact-osx
51+
name: artifact-osx-13
52+
path: "*.dmg"
53+
54+
macos-14:
55+
runs-on: macos-14
56+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
57+
steps:
58+
- uses: actions/checkout@v5
59+
- name: Install dependencies
60+
run: brew install automake autoconf wxwidgets
61+
- run: aclocal
62+
- run: automake --add-missing
63+
- run: autoconf
64+
- run: ./configure
65+
- run: make
66+
- run: sudo make install
67+
- run: make osx-dmg
68+
- uses: actions/upload-artifact@v4
69+
with:
70+
name: artifact-osx-14
5471
path: "*.dmg"
5572

5673
windows:
@@ -60,7 +77,7 @@ jobs:
6077
run:
6178
shell: msys2 {0}
6279
steps:
63-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v5
6481
- uses: msys2/setup-msys2@v2
6582
with:
6683
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
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: windows-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- name: Set up Python
1717
uses: actions/setup-python@v5
1818
with:

‎ChangeLog‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
by the order encountered in a depth-first traversal of the tree - can now be obtained by calling
2828
`SortInfosets` (C++) or `sort_infosets` (Python) on the game. (#483)
2929

30-
## [16.3.1] - unreleased
30+
## [16.3.1] - 2025-08-18
3131

3232
### Fixed
3333
- Corrected a regression in which information sets were prematurely invalidated (and therefore
@@ -76,12 +76,15 @@
7676
Explorer, as GTE no longer reads files in this format.
7777

7878

79-
## [16.2.2] - unreleased
79+
## [16.2.2] - 2025-08-18
8080

8181
### Fixed
8282
- `Game.copy_tree` and `Game.move_tree` implementations reversed the roles of the
8383
`src` and `dest` nodes (#499)
8484

85+
### Changed
86+
- For graphical interface, added support for wxWidgets 3.3; require minimum of wxWidgets 3.2.
87+
8588
## [16.2.1] - 2025-01-06
8689

8790
### Fixed

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dnl along with this program; if not, write to the Free Software
2020
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
2121
dnl
2222

23-
AC_INIT([gambit],[16.3.0])
23+
AC_INIT([gambit],[16.3.1])
2424
AC_CONFIG_SRCDIR([src/gambit.h])
2525
AM_INIT_AUTOMAKE([subdir-objects foreign])
2626
dnl AC_CONFIG_MACRO_DIR([m4])

‎contrib/mac/Info.plist‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>16.3.0</string>
22+
<string>16.3.1</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>16.3.0</string>
24+
<string>16.3.1</string>
2525
<key>CFBundleGetInfoString</key>
26-
<string>Gambit version 16.3.0, (c) 1994-2025 The Gambit Project</string>
26+
<string>Gambit version 16.3.1, (c) 1994-2025 The Gambit Project</string>
2727
<key>CFBundleLongVersionString</key>
28-
<string>16.3.0, (c) 1994-2025 The Gambit Project</string>
28+
<string>16.3.1, (c) 1994-2025 The Gambit Project</string>
2929
<key>NSHumanReadableCopyright</key>
3030
<string>Copyright 1994-2025 The Gambit Project</string>
3131
<key>LSRequiresCarbon</key>

‎doc/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
# The short X.Y version.
5252
version = "16.3"
5353
# The full version, including alpha/beta/rc tags.
54-
release = "16.3.0"
54+
release = "16.3.1"
5555

5656
# The language for content autogenerated by Sphinx. Refer to documentation
5757
# for a list of supported languages.

‎doc/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ made.
3333
If you are citing Gambit in a paper, we suggest a citation of the form:
3434

3535
Savani, Rahul and Turocy, Theodore L. (2025)
36-
Gambit: The package for computation in game theory, Version 16.3.0.
36+
Gambit: The package for computation in game theory, Version 16.3.1.
3737
https://www.gambit-project.org.
3838

3939
Replace the version number and year as appropriate if you use a

0 commit comments

Comments
 (0)