Skip to content

Add draw_tree visuals to tutorials 2&3 #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edwardchalstrey1 merged 37 commits into from
Dec 11, 2025
Merged

Add draw_tree visuals to tutorials 2&3 #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
8762977
Add texlive-full to apt_packages in Read the Docs configuration
edwardchalstrey1 Dec 3, 2025
8e9fc7b
Add draw-tree dependency to requirements for tutorials
edwardchalstrey1 Dec 3, 2025
51cb363
Add Jupyter notebook checkpoints to .gitignore
edwardchalstrey1 Dec 3, 2025
910a4b2
ignore .ef files generated by draw_tree in tutorials
edwardchalstrey1 Dec 3, 2025
49ca9f7
add draw_tree to extensive form tutorial
edwardchalstrey1 Dec 3, 2025
e6579f5
update extensive form notebook to save tree image to file with draw_tree
edwardchalstrey1 Dec 3, 2025
38f8f47
add draw_tree to stripped down poker tutorial
edwardchalstrey1 Dec 3, 2025
d85abdc
rerun notebooks after reducing draw_tree scale factor
edwardchalstrey1 Dec 3, 2025
e3c58d6
skip tests tutorial tests if draw_tree is not installed
edwardchalstrey1 Dec 4, 2025
ed078b4
windows action installs everything except open_spiel
edwardchalstrey1 Dec 4, 2025
ff93d0f
replace linux action python versions from 3.9 to 3.10
edwardchalstrey1 Dec 4, 2025
2497bf2
Revert "skip tests tutorial tests if draw_tree is not installed"
edwardchalstrey1 Dec 4, 2025
ae9cab1
add flag for running tutorials with pytest
edwardchalstrey1 Dec 4, 2025
2f8227b
add flag to run tutorials with pytest in CI workflows
edwardchalstrey1 Dec 4, 2025
760af77
update python.yml from #661
edwardchalstrey1 Dec 4, 2025
8975f5b
ingore open_spiel on windows
edwardchalstrey1 Dec 4, 2025
30946af
add conftest.py from #661
edwardchalstrey1 Dec 4, 2025
cb62b40
Add pytest marker for tutorial notebooks in test_execute_notebook
edwardchalstrey1 Dec 4, 2025
8674441
Update Python version in CI workflow from. 3.13 to 3.14
edwardchalstrey1 Dec 4, 2025
28f3860
Don't skip tutorial tests if that file is explicitly run
edwardchalstrey1 Dec 4, 2025
ae9d5a0
exclude tutorials from pytest for specifically macos13 with python 3.…
edwardchalstrey1 Dec 4, 2025
0cee463
Add instructions for running tutorial notebook tests with pytest
edwardchalstrey1 Dec 4, 2025
d7c402f
Update Python version requirement from >=3.9 to >=3.10 in pyproject.toml
edwardchalstrey1 Dec 4, 2025
3504b77
Add Python 3.14 to the list of supported programming languages in cla…
edwardchalstrey1 Dec 4, 2025
4d906c7
Merge branch 'fix/659' into add-drawtree-to-tutorials
edwardchalstrey1 Dec 4, 2025
146b99d
fix merge mistake
edwardchalstrey1 Dec 4, 2025
8828fa0
force readthedocs to reinstall draw-tree from latest main branch sinc…
edwardchalstrey1 Dec 4, 2025
444a30e
Update Python version in ReadTheDocs configuration to 3.14
edwardchalstrey1 Dec 4, 2025
743d0d1
try again with force reinstall of draw_tree
edwardchalstrey1 Dec 4, 2025
98d8800
revert superfluous changes
edwardchalstrey1 Dec 4, 2025
a57fdc7
remobe draw_tree force install which didn't work as expected
edwardchalstrey1 Dec 4, 2025
9b71aa7
try specifying draw_tree version
edwardchalstrey1 Dec 4, 2025
8b9307f
fix: correct draw_tree naming in requirements.txt and specify version
edwardchalstrey1 Dec 4, 2025
ba672e8
Revert "fix: correct draw_tree naming in requirements.txt and specify…
edwardchalstrey1 Dec 4, 2025
d7b5abe
set draw_tree version to 0.2.0 which is an actual release
edwardchalstrey1 Dec 8, 2025
c68fe0b
Merge branch 'master' into add-drawtree-to-tutorials
edwardchalstrey1 Dec 8, 2025
08ffd7d
resave notebook outputs
edwardchalstrey1 Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
strategy:
matrix:
python-version: ['3.9', '3.13']
python-version: ['3.10', '3.14']

steps:
- uses: actions/checkout@v5
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
strategy:
matrix:
python-version: ['3.13']
python-version: ['3.14']

steps:
- uses: actions/checkout@v4
Expand All @@ -63,7 +63,7 @@ jobs:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
strategy:
matrix:
python-version: ['3.13']
python-version: ['3.14']

steps:
- uses: actions/checkout@v4
Expand All @@ -88,7 +88,7 @@ jobs:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
strategy:
matrix:
python-version: ['3.13']
python-version: ['3.14']

steps:
- uses: actions/checkout@v5
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,8 @@ Gambit.app/*
*.so
doc/tutorials/games/*.nfg
doc/tutorials/games/*.efg
doc/tutorials/*.png
*.dmg
Gambit.app/*
*.ipynb_checkpoints
*.ef
3 changes: 2 additions & 1 deletion .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ formats: all
build:
os: ubuntu-22.04
tools:
python: "3.13"
python: "3.14"
apt_packages:
- libgmp-dev
- pandoc
- texlive-full

python:
install:
Expand Down
1 change: 1 addition & 0 deletions doc/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ matplotlib
pickleshare
jupyter
open_spiel; sys_platform != 'win32'
draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.2.0
1,006 changes: 966 additions & 40 deletions doc/tutorials/02_extensive_form.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

1,324 changes: 1,243 additions & 81 deletions doc/tutorials/03_stripped_down_poker.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "pygambit"
version = "16.4.0"
description = "The package for computation in game theory"
readme = "src/README.rst"
requires-python = ">=3.9"
requires-python = ">=3.10"
license = "GPL-2.0-or-later"
authors = [
{name = "Theodore Turocy", email = "ted.turocy@gmail.com"},
Expand All @@ -17,11 +17,11 @@ keywords = ["game theory", "Nash equilibrium"]
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Science/Research",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Scientific/Engineering :: Mathematics"
]
Expand Down
Loading