Skip to content

Commit a718419

Browse files
Merge branch 'master' into add-pre-commit
2 parents 6d763ad + 29993b7 commit a718419

66 files changed

Lines changed: 4271 additions & 4379 deletions

Some content is hidden

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

.all-contributorsrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"ideas"
3535
]
3636
},
37-
{
37+
{
3838
"login": "edwardchalstrey1",
3939
"name": "Ed Chalstrey",
4040
"avatar_url": "https://avatars.githubusercontent.com/u/5486164?v=4",
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Tutorial request
2+
description: Submit a request for a new tutorial to be added to the Gambit documentation.
3+
title: "[Tutorial]: "
4+
labels: ["tutorial", "documentation"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this tutorial request!
10+
- type: textarea
11+
id: describe
12+
attributes:
13+
label: Describe the tutorial you want to see.
14+
description: Go into as much detail as you can regarding the tutorial you would like to see, how long it should be etc.
15+
placeholder: "E.g. A step-by-step guide showing how to use PyGambit to compute equilibria for normal and extensive form games..."
16+
value: "Add a tutorial demonstrating the core components of the PyGambit API."
17+
validations:
18+
required: true
19+
- type: textarea
20+
id: who
21+
attributes:
22+
label: Who is the tutorial for?
23+
description: Explain who the target audience is for this tutorial and what prior knowledge they should have.
24+
placeholder: "E.g. Beginners in game theory who know basic Python."
25+
value: "Newcomers to game theory and the Gambit software who have basic Python programming skills."
26+
validations:
27+
required: true
28+
- type: textarea
29+
id: links
30+
attributes:
31+
label: Add links to papers and software.
32+
description: Add links to any research papers or other resources the author will need to write this tutorial.
33+
value: "`[Markdown link text](url)`"
34+
validations:
35+
required: false

.github/workflows/python.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set up dependencies
3030
run: |
3131
python -m pip install --upgrade pip
32-
pip install setuptools build cython pytest pytest-skip-slow wheel lxml numpy scipy
32+
pip install setuptools build cython pytest pytest-skip-slow wheel lxml numpy scipy nbformat nbclient ipykernel
3333
- name: Build source distribution
3434
run:
3535
python -m build
@@ -38,7 +38,13 @@ jobs:
3838
cd dist
3939
pip install -v pygambit*.tar.gz
4040
- name: Run tests
41-
run: pytest
41+
run: |
42+
if [ "${{ matrix.python-version }}" = "3.9" ]; then
43+
# Python 3.9 on linux skips the notebook execution test (notebooks may require newer kernels/deps)
44+
pytest -q -k 'not test_execute_notebook'
45+
else
46+
pytest
47+
fi
4248
4349
macos-13:
4450
runs-on: macos-13
@@ -56,7 +62,7 @@ jobs:
5662
- name: Set up dependencies
5763
run: |
5864
python -m pip install --upgrade pip
59-
pip install cython pytest pytest-skip-slow wheel lxml numpy scipy
65+
pip install cython pytest pytest-skip-slow wheel lxml numpy scipy nbformat nbclient ipykernel
6066
- name: Build extension
6167
run: |
6268
python -m pip install -v .
@@ -79,7 +85,7 @@ jobs:
7985
- name: Set up dependencies
8086
run: |
8187
python -m pip install --upgrade pip
82-
pip install cython pytest pytest-skip-slow wheel lxml numpy scipy
88+
pip install cython pytest pytest-skip-slow wheel lxml numpy scipy nbformat nbclient ipykernel
8389
- name: Build extension
8490
run: |
8591
python -m pip install -v .
@@ -102,7 +108,7 @@ jobs:
102108
- name: Set up dependencies
103109
run: |
104110
python -m pip install --upgrade pip
105-
pip install cython pytest pytest-skip-slow wheel lxml numpy scipy
111+
pip install cython pytest pytest-skip-slow wheel lxml numpy scipy nbformat nbclient ipykernel
106112
- name: Build extension
107113
run: |
108114
python -m pip install -v .

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,7 @@ gambit
3838
dist
3939
.venv
4040
*.dmg
41-
Gambit.app/*
41+
Gambit.app/*
42+
*.so
43+
doc/tutorials/games/*.nfg
44+
doc/tutorials/games/*.efg

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.6.0
3+
rev: v6.0.0
44
hooks:
55
- id: trailing-whitespace
66
- id: end-of-file-fixer
77
- id: check-yaml
88
- id: check-added-large-files
99
- repo: https://github.com/astral-sh/ruff-pre-commit
10-
rev: v0.6.1
10+
rev: v0.14.5
1111
hooks:
1212
- id: ruff
1313
- repo: https://github.com/pycqa/flake8
14-
rev: 7.1.0
14+
rev: 7.3.0
1515
hooks:
1616
- id: flake8
1717
- repo: https://github.com/MarcoGorelli/cython-lint
18-
rev: v0.16.2
18+
rev: v0.18.1
1919
hooks:
2020
- id: cython-lint
2121
- id: double-quote-cython-strings

.readthedocs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ build:
1111
python: "3.13"
1212
apt_packages:
1313
- libgmp-dev
14+
- pandoc
1415

1516
python:
1617
install:

contrib/demos/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

contrib/demos/README.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

contrib/demos/bagwell.efg

Lines changed: 0 additions & 18 deletions
This file was deleted.

contrib/demos/bagwell.ipynb

Lines changed: 0 additions & 143 deletions
This file was deleted.

0 commit comments

Comments
 (0)