Skip to content

Commit 2a4cfbf

Browse files
committed
Merge branch 'master' into dev_terminology
# Conflicts: # tests/test_game.py
2 parents 8e92042 + 87bf52f commit 2a4cfbf

62 files changed

Lines changed: 3708 additions & 1540 deletions

Some content is hidden

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

.github/pull_request_template.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
_Thanks for contributing to Gambit! Before you submitting or reviewing a pull request, check out our [guidelines for contributing](https://gambitproject.readthedocs.io/en/latest/developer.contributing.html)._
2+
3+
_The person submitting the PR should ensure it has an informative title and update the headers below, before marking the PR as ready for review and assigning reviewers._
4+
5+
### Issues closed by this PR
6+
7+
_Add any issues that are being closed by this PR to the list. Use "Closes" or [another keyword](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) followed by the issue number._
8+
9+
- Closes #ISSUE_NUMBER
10+
11+
### Description of the changes in this PR
12+
13+
_Update the description of the changes made in this PR. You can delete this section if the changes are already fully described in the linked issues._
14+
15+
This PR ...
16+
17+
### How to review this PR
18+
19+
_The gambit repository contains source code and documentation for several different components. Explain how a reviewer should approach reviewing the specific changes made in this PR._
20+
21+
_For example, you might include instructions like:_
22+
- _"Review code changes and ensure tests cover edge cases"_
23+
- _"Rebuild the GUI from this branch, then test features X, Y, Z work as expected"_
24+
- _"Click the link to the documentation page and sense check by reading"_

.github/workflows/osxbinary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- run: make
3232
- run: sudo make install
3333
- run: make osx-dmg
34-
- uses: actions/upload-artifact@v5
34+
- uses: actions/upload-artifact@v6
3535
with:
3636
name: artifact-osx-14
3737
path: "*.dmg"

.github/workflows/python.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Run tests
3535
run: pytest --run-tutorials
3636

37-
macos-13:
37+
macos-14:
3838
runs-on: macos-14
3939
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
4040
strategy:
@@ -52,13 +52,14 @@ jobs:
5252
python -m pip install --upgrade pip
5353
pip install setuptools build cython wheel
5454
pip install -r tests/requirements.txt
55+
pip install -r doc/requirements.txt
5556
- name: Build extension
5657
run: |
5758
python -m pip install -v .
5859
- name: Run tests
59-
run: pytest
60+
run: pytest --run-tutorials
6061

61-
macos-14:
62+
macos-15:
6263
runs-on: macos-15
6364
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
6465
strategy:

.github/workflows/tools.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- run: make
4747
- run: sudo make install
4848
- run: make osx-dmg
49-
- uses: actions/upload-artifact@v5
49+
- uses: actions/upload-artifact@v6
5050
with:
5151
name: artifact-osx-14
5252
path: "*.dmg"
@@ -65,7 +65,7 @@ jobs:
6565
- run: make
6666
- run: sudo make install
6767
- run: make osx-dmg
68-
- uses: actions/upload-artifact@v5
68+
- uses: actions/upload-artifact@v6
6969
with:
7070
name: artifact-osx-15
7171
path: "*.dmg"
@@ -93,7 +93,7 @@ jobs:
9393
cp gambit* installer
9494
"${WIX}bin/candle" build_support/msw/gambit.wxs
9595
"${WIX}bin/light" -ext WixUIExtension gambit.wixobj
96-
- uses: actions/upload-artifact@v5
96+
- uses: actions/upload-artifact@v6
9797
with:
9898
name: artifact-msw
9999
path: "*.msi"

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
python -m cibuildwheel --output-dir wheelhouse/
2828
env:
2929
CIBW_SKIP: "pp*"
30-
- uses: actions/upload-artifact@v5
30+
- uses: actions/upload-artifact@v6
3131
with:
3232
path: ./wheelhouse/*.whl

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,8 @@ Gambit.app/*
4343
*.so
4444
doc/tutorials/games/*.nfg
4545
doc/tutorials/games/*.efg
46+
doc/tutorials/*.png
4647
*.dmg
4748
Gambit.app/*
49+
*.ipynb_checkpoints
50+
*.ef

.readthedocs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ build:
1212
apt_packages:
1313
- libgmp-dev
1414
- pandoc
15+
- texlive-full
1516

1617
python:
1718
install:

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [16.5.0] - unreleased
44

5+
### Added
6+
- Implement `IsAbsentMinded()` on information sets (C++) and `Infoset.is_absent_minded` (Python)
7+
to detect if an information is absent-minded.
8+
59
### Changed
610
- In the graphical interface, removed option to configure information set link drawing; information sets
711
are always drawn and indicators are always drawn if an information set spans multiple levels.

Makefile.am

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,11 @@ core_SOURCES = \
251251
src/core/recarray.h \
252252
src/core/matrix.h \
253253
src/core/matrix.imp \
254-
src/core/sqmatrix.h \
255-
src/core/sqmatrix.imp \
256254
src/core/integer.cc \
257255
src/core/integer.h \
258256
src/core/rational.cc \
259257
src/core/rational.h \
260258
src/core/matrix.cc \
261-
src/core/sqmatrix.cc \
262259
src/core/function.cc \
263260
src/core/function.h \
264261
src/core/tinyxml.cc \
@@ -407,7 +404,6 @@ gambit_enumpoly_SOURCES = \
407404
src/solvers/enumpoly/rectangle.h \
408405
src/solvers/enumpoly/poly.cc \
409406
src/solvers/enumpoly/poly.h \
410-
src/solvers/enumpoly/poly.imp \
411407
src/solvers/enumpoly/polysystem.h \
412408
src/solvers/enumpoly/polypartial.h \
413409
src/solvers/enumpoly/polypartial.imp \
@@ -568,7 +564,6 @@ gambit_SOURCES = \
568564
src/gui/dlefglogit.cc \
569565
src/gui/dlefglogit.h \
570566
src/gui/dlefgreveal.cc \
571-
src/gui/dlefgreveal.h \
572567
src/gui/dlexcept.h \
573568
src/gui/dlgameprop.cc \
574569
src/gui/dlgameprop.h \

doc/developer.contributing.rst

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ version.
3737

3838
1. To get started contributing code in the `Gambit GitHub repo <https://github.com/gambitproject/gambit>`__, do one of the following:
3939

40-
- Core developers: request contributor access from one of the `team <https://www.gambit-project.org/team/>`__
41-
- External contributors: fork the repository on GitHub.
40+
- Core developers: request contributor access from one of the `team <https://www.gambit-project.org/team/>`__
41+
- External contributors: fork the repository on GitHub.
4242

4343
2. Clone the repository to your local machine ::
4444

@@ -63,9 +63,9 @@ version.
6363

6464
Having `pre-commit` installed is recommended as it runs many of the same checks that are automatically conducted on any pull request. Every time you commit, it will automatically fix some issues and highlight others for manual adjustment.
6565

66-
5. Create a new branch for your changes ::
66+
5. Create a new branch for your changes. It's good practice to either give the branch a descriptive name or directly reference an issue number ::
6767

68-
git checkout -b feature/your-feature-name
68+
git checkout -b feature/issue-number
6969

7070
6. Make your changes. ::
7171

@@ -78,11 +78,22 @@ version.
7878

7979
7. Push your changes to your fork or branch ::
8080

81-
git push origin feature/your-feature-name
81+
git push origin feature/issue-number
82+
83+
8. Open a pull request on GitHub to the master branch of the upstream repository. Ensure your pull request:
84+
85+
- Has an informative title.
86+
- Links to any relevant issues.
87+
- Includes a clear description of the changes made.
88+
- Explains how a reviewer can test the changes.
89+
90+
.. note::
91+
It's good practice to open a draft pull request early in the development process to facilitate discussion and feedback, ensure there are no merge conflicts, and allow for continuous integration testing via GitHub Actions.
8292

83-
8. Open a pull request on GitHub to the master branch of the upstream repository, describing your changes and linking to any relevant issues.
8493
9. Core developers will review your changes, provide feedback, and merge them into the master branch if they meet the project's standards.
8594

95+
10. Once your pull request is merged, delete your branch on GitHub (a button should appear to do this automatically).
96+
8697
Testing your changes
8798
--------------------
8899

0 commit comments

Comments
 (0)