Merge branch 'master' into fix/541

edwardchalstrey1 · edwardchalstrey1 · commit f17749c123a5 · 2025-08-20T11:21:36.000+01:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -17,7 +17,7 @@ jobs:
     name: clang-format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Run clang-format style check for C/C++
         uses: jidicula/clang-format-action@v4.15.0
         with:
@@ -29,19 +29,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install dependencies
         run: |
           sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc
-          sudo apt-add-repository 'deb https://repos.codelite.org/wx3.1.5/ubuntu/ focal universe'
           sudo apt-get update
-          sudo apt-get install -y automake autoconf clang-tidy
-          sudo apt-get install -y libwxbase3.1-0-unofficial \
-                libwxbase3.1unofficial-dev \
-                libwxgtk3.1-0-unofficial \
-                libwxgtk3.1unofficial-dev \
-                wx3.1-headers \
-                wx-common
+          sudo apt-get install -y automake autoconf libwxgtk3.2-dev clang-tidy
       - run: aclocal
       - run: automake --add-missing
       - run: autoconf
@@ -52,14 +45,14 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: chartboost/ruff-action@v1
 
   flake8:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
@@ -69,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/osxbinary.yml b/.github/workflows/osxbinary.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: macos-13
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install dependencies
         run: |
             brew install automake autoconf
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -21,7 +21,7 @@ jobs:
         python-version: ['3.9', '3.13']
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
@@ -94,7 +94,7 @@ jobs:
         python-version: ['3.13']
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
@@ -17,14 +17,12 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install dependencies
         run: |
           sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc
-          sudo apt-add-repository 'deb https://repos.codelite.org/wx3.1.5/ubuntu/ focal universe'
           sudo apt-get update
-          sudo apt-get install -y automake autoconf
-          sudo apt-get install -y libwxgtk3.2-dev
+          sudo apt-get install -y automake autoconf libwxgtk3.2-dev
       - name: Configure build with autotools
         run: |
           aclocal
@@ -43,10 +41,10 @@ jobs:
           sudo make install
 
   macos:
-    runs-on: macos-latest
+    runs-on: macos-13
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install dependencies
         run: brew install automake autoconf wxwidgets
       - run: aclocal
@@ -58,7 +56,26 @@ jobs:
       - run: make osx-dmg
       - uses: actions/upload-artifact@v4
         with:
-          name: artifact-osx
+          name: artifact-osx-13
+          path: "*.dmg"
+
+  macos-14:
+    runs-on: macos-14
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    steps:
+      - uses: actions/checkout@v5
+      - name: Install dependencies
+        run: brew install automake autoconf wxwidgets
+      - run: aclocal
+      - run: automake --add-missing
+      - run: autoconf
+      - run: ./configure
+      - run: make
+      - run: sudo make install
+      - run: make osx-dmg
+      - uses: actions/upload-artifact@v4
+        with:
+          name: artifact-osx-14
           path: "*.dmg"
 
   windows:
@@ -68,7 +85,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: msys2/setup-msys2@v2
         with:
           install: mingw-w64-x86_64-toolchain make automake autoconf
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
diff --git a/ChangeLog b/ChangeLog
@@ -27,7 +27,7 @@
   by the order encountered in a depth-first traversal of the tree - can now be obtained by calling
   `SortInfosets` (C++) or `sort_infosets` (Python) on the game.  (#483)
 
-## [16.3.1] - unreleased
+## [16.3.1] - 2025-08-18
 
 ### Fixed
 - Corrected a regression in which information sets were prematurely invalidated (and therefore
@@ -76,12 +76,15 @@
   Explorer, as GTE no longer reads files in this format.
 
 
-## [16.2.2] - unreleased
+## [16.2.2] - 2025-08-18
 
 ### Fixed
 - `Game.copy_tree` and `Game.move_tree` implementations reversed the roles of the
   `src` and `dest` nodes (#499)
 
+### Changed
+- For graphical interface, added support for wxWidgets 3.3; require minimum of wxWidgets 3.2.
+
 ## [16.2.1] - 2025-01-06
 
 ### Fixed
diff --git a/configure.ac b/configure.ac
@@ -20,7 +20,7 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl
 
-AC_INIT([gambit],[16.3.0])
+AC_INIT([gambit],[16.3.1])
 AC_CONFIG_SRCDIR([src/gambit.h])
 AM_INIT_AUTOMAKE([subdir-objects foreign])
 dnl AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/mac/Info.plist b/contrib/mac/Info.plist
@@ -19,13 +19,13 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>16.3.0</string>
+	<string>16.3.1</string>
 	<key>CFBundleShortVersionString</key>
-	<string>16.3.0</string>
+	<string>16.3.1</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Gambit version 16.3.0, (c) 1994-2025 The Gambit Project</string>
+	<string>Gambit version 16.3.1, (c) 1994-2025 The Gambit Project</string>
 	<key>CFBundleLongVersionString</key>
-	<string>16.3.0, (c) 1994-2025 The Gambit Project</string>
+	<string>16.3.1, (c) 1994-2025 The Gambit Project</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 1994-2025 The Gambit Project</string>
 	<key>LSRequiresCarbon</key>
diff --git a/doc/conf.py b/doc/conf.py
@@ -55,7 +55,7 @@
 # The short X.Y version.
 version = "16.3"
 # The full version, including alpha/beta/rc tags.
-release = "16.3.0"
+release = "16.3.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/pygambit.api.rst b/doc/pygambit.api.rst
@@ -128,6 +128,7 @@ Information about the game
    :toctree: api/
 
    Outcome.label
+   Outcome.number
    Outcome.game
 
 .. autosummary::
diff --git a/doc/tools.convert.rst b/doc/tools.convert.rst
@@ -40,7 +40,7 @@ Example invocation for HTML output::
 
    $ gambit-convert -O html 2x2.nfg
    Convert games among various file formats
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    <center><h1>Two person 2 x 2 game with unique mixed equilibrium</h1></center>
@@ -55,7 +55,7 @@ Example invocation for LaTeX output::
 
    $ gambit-convert -O sgame 2x2.nfg
    Convert games among various file formats
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    \begin{game}{2}{2}[Player 1][Player 2]
diff --git a/doc/tools.enummixed.rst b/doc/tools.enummixed.rst
@@ -70,7 +70,7 @@ in Figure 2 of Selten (International Journal of Game Theory,
 
    $ gambit-enummixed e02.nfg
    Compute Nash equilibria by enumerating extreme points
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    NE,1,0,0,1,0
@@ -82,7 +82,7 @@ information using the `-c` switch::
 
    $ gambit-enummixed -c e02.nfg
    Compute Nash equilibria by enumerating extreme points
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    NE,1,0,0,1,0
diff --git a/doc/tools.enumpoly.rst b/doc/tools.enumpoly.rst
@@ -98,7 +98,7 @@ Computing equilibria of the strategic game :download:`e01.nfg
 
    $ gambit-enumpoly e01.nfg
    Compute Nash equilibria by solving polynomial systems
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    NE,1.000000,0.000000,1.000000,0.000000,0.000000,1.000000
diff --git a/doc/tools.enumpure.rst b/doc/tools.enumpure.rst
@@ -66,7 +66,7 @@ Computing the pure-strategy equilibria of extensive game :download:`e02.efg
 
    $ gambit-enumpure e02.efg
    Search for Nash equilibria in pure strategies
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    NE,1,0,0,0,1,0
@@ -77,7 +77,7 @@ strategies::
 
    $ gambit-enumpure -S e02.efg
    Search for Nash equilibria in pure strategies
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    NE,1,0,0,1,0
@@ -88,7 +88,7 @@ only one information set; therefore the set of solutions is larger::
 
    $ gambit-enumpure -A e02.efg
    Search for Nash equilibria in pure strategies
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    NE,1,0,1,0,1,0
diff --git a/doc/tools.gnm.rst b/doc/tools.gnm.rst
@@ -88,7 +88,7 @@ the reduced strategic form of the example in Figure 2 of Selten
     $ gambit-gnm e02.nfg
     Compute Nash equilibria using a global Newton method
     Gametracer version 0.2, Copyright (C) 2002, Ben Blum and Christian Shelton
-    Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+    Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
     This is free software, distributed under the GNU GPL
 
     NE,1,0,2.99905e-12,0.5,0.5
diff --git a/doc/tools.ipa.rst b/doc/tools.ipa.rst
@@ -55,7 +55,7 @@ the reduced strategic form of the example in Figure 2 of Selten
    $ gambit-ipa e02.nfg
    Compute Nash equilibria using iterated polymatrix approximation
    Gametracer version 0.2, Copyright (C) 2002, Ben Blum and Christian Shelton
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    NE,1.000000,0.000000,0.000000,1.000000,0.000000
diff --git a/doc/tools.lcp.rst b/doc/tools.lcp.rst
@@ -79,7 +79,7 @@ Computing an equilibrium of extensive game :download:`e02.efg
 
    $ gambit-lcp e02.efg
    Compute Nash equilibria by solving a linear complementarity program
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    NE,1,0,1/2,1/2,1/2,1/2
diff --git a/doc/tools.liap.rst b/doc/tools.liap.rst
@@ -85,7 +85,7 @@ Computing an equilibrium in mixed strategies of :download:`e02.efg
 
    $ gambit-liap e02.nfg
    Compute Nash equilibria by minimizing the Lyapunov function
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
-   NE, 0.998701, 0.000229, 0.001070, 0.618833, 0.381167
+   NE,0.998701,0.000229,0.001070,0.618833,0.381167
diff --git a/doc/tools.logit.rst b/doc/tools.logit.rst
@@ -108,7 +108,7 @@ in Figure 2 of Selten (International Journal of Game Theory,
 
    $ gambit-logit e02.nfg
    Compute a branch of the logit equilibrium correspondence
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    0.000000,0.333333,0.333333,0.333333,0.5,0.5
diff --git a/doc/tools.lp.rst b/doc/tools.lp.rst
@@ -65,7 +65,7 @@ strategies each, with a unique equilibrium in mixed strategies::
 
    $ gambit-lp 2x2const.nfg
    Compute Nash equilibria by solving a linear program
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    NE,1/3,2/3,1/3,2/3
diff --git a/doc/tools.simpdiv.rst b/doc/tools.simpdiv.rst
@@ -92,7 +92,7 @@ Computing an equilibrium in mixed strategies of :download:`e02.efg
 
    $ gambit-simpdiv e02.nfg
    Compute Nash equilibria using simplicial subdivision
-   Gambit version 16.3.0, Copyright (C) 1994-2025, The Gambit Project
+   Gambit version 16.3.1, Copyright (C) 1994-2025, The Gambit Project
    This is free software, distributed under the GNU GPL
 
    NE,1,0,0,1,0
diff --git a/gambit.wxs b/gambit.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="8EE11AE3-2B91-4870-895B-44C46D648BD6" Name="Gambit 16" Language="1033" Version="16.3.0" Manufacturer="The Gambit Project" UpgradeCode="135FFB28-DA7C-427C-A3DA-783B805BCC22">
+    <Product Id="8EE11AE3-2B91-4870-895B-44C46D648BD6" Name="Gambit 16" Language="1033" Version="16.3.1" Manufacturer="The Gambit Project" UpgradeCode="135FFB28-DA7C-427C-A3DA-783B805BCC22">
         <Package Description="Gambit" Comments="Software Tools for Game Theory" InstallerVersion="200" Compressed="yes" />
         <Media Id="1" Cabinet="gambit.cab" EmbedCab="yes" />
 
diff --git a/src/pygambit/__init__.py b/src/pygambit/__init__.py
@@ -28,4 +28,4 @@
     supports,  # noqa: F401
 )
 
-__version__ = "16.3.0"
+__version__ = "16.3.1"
diff --git a/src/pygambit/outcome.pxi b/src/pygambit/outcome.pxi
