Skip to content

Commit 1f3a9ac

Browse files
AllenDowneyclaude
andcommitted
CI on the current Colab Python (3.13), current actions; retire the PyPI package.
Removed setup.py and README.rst; the README says the modsimpy package on PyPI is outdated. Project board: Task 4 done, Task 6 added. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 136b2a9 commit 1f3a9ac

5 files changed

Lines changed: 19 additions & 244 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
matrix:
1818
# don't run on macos-latest; it can't install pytables
1919
os: [ubuntu-latest, windows-latest]
20-
python-version: ["3.12"]
20+
python-version: ["3.13"] # current Colab version
2121

2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v5
2424

2525
- name: Set up Python ${{ matrix.python-version }}
26-
uses: actions/setup-python@v2
26+
uses: actions/setup-python@v6
2727
with:
2828
python-version: ${{ matrix.python-version }}
2929

‎PROJECT_BOARD.md‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ This is the public repo for *Modeling and Simulation in Python* (No Starch, 2023
66

77
### Current focus (2026-10-13)
88

9-
Tasks 1–4 (cleanup) done 2026-10-13, except two open decisions:
9+
Tasks 1–4 (cleanup) and Task 6 (CI and build fixes) done 2026-10-13. Still open:
1010

1111
- **Task 3:** delete `~/ModSimPy-attic/` once nothing has been missed
12-
- **Task 4:** retire or revive the `modsimpy` PyPI package
1312

1413
---
1514

@@ -57,7 +56,7 @@ So `make build` copies from `modsim/` outward and then, in the API-docs step, ba
5756
- [x] `notes.txt` and `plan.md` merged into the README's "Development" section (three repos, canonical `modsim.py`, files that must stay put, update steps, testing); `notes.txt` removed, `plan.md` in the attic
5857
- [x] `Makefile`: `lint` and `format` removed
5958

60-
Note: `make build` pushes several times (ModSimPySolutions, ModSimPy chapters and examples, `gh-pages`), and each push to `master` runs CI.
59+
Note: `make build` pushes ModSimPySolutions once, ModSimPy once (at the end of the notebook steps) and `gh-pages`; only the `master` pushes run CI (Task 6).
6160

6261
## Task 3: Clear the untracked junk out of the working tree
6362

@@ -88,13 +87,13 @@ Note: `make build` pushes several times (ModSimPySolutions, ModSimPy chapters an
8887
- [x] Legacy folders and stray files moved to `~/ModSimPy-attic/` (also `modsim/solvers/` and `modsim/docs/` from 2019). Checked without pushing: MkDocs API docs build, `modsim` tests pass (40), Jupyter Book builds
8988
- [ ] Delete `~/ModSimPy-attic/` once nothing has been missed
9089
- [x] `.gitignore` extended; `git status` is clean. `chapters/chapNN.py` stay tracked (`chapters/build.sh` commits them)
91-
- [x] Local branches `main` and `version3` deleted (`version3` is still on GitHub); `git gc` run (pack now 114 MB, mostly recent unreachable objects that later gc runs will prune)
90+
- [x] Local branches `main` and `version3` deleted (`version3`, merged as PR #42 in 2019, also deleted on GitHub); `git gc` run (pack now 114 MB, mostly recent unreachable objects that later gc runs will prune)
9291

9392
Keep `modsim/__init__.py`: `mkdocs.yml` documents `::: modsim`, which imports the `modsim/` package.
9493

9594
## Task 4: Remove tracked files nothing uses
9695

97-
**Status:** Done except the packaging decision (2026-10-13, `b66332c`)
96+
**Status:** Done (2026-10-13)
9897

9998
**Background:** These are in git and on GitHub but nothing in the build or the notebooks uses them (checked against every `raw/master/…` URL in the ModSimPySolutions notebooks, 2026-10-13). Removing them from `master` doesn't shrink history; that would need a rewrite, which isn't worth it at 34 MB.
10099

@@ -108,7 +107,7 @@ Keep `modsim/__init__.py`: `mkdocs.yml` documents `::: modsim`, which imports th
108107
### Checklist
109108

110109
- [x] Remove `papers/`
111-
- [ ] Packaging decision (retire or revive). If retiring, remove `setup.py` and `README.rst` (the only Binder mention) but keep `modsim/__init__.py` (see Task 3)
110+
- [x] Packaging: **retired**. Removed `setup.py` and `README.rst`; the README says the PyPI `modsimpy` package is outdated. `modsim/__init__.py` kept (see Task 3)
112111
- [x] Removed `_config.yml` and `apt.txt` (nothing links to Binder)
113112
- [x] `data/`: kept. Old notebook versions in history download `baseball_drag.csv`, `glucose_insulin.csv`, `World_population_estimates2/3.csv` and `.html` from it. `figs/`: removed `golden*` and `secant*`; only `baseball_drag.png` was ever downloaded
114113
- [x] Root `chap18.py` kept
@@ -123,6 +122,15 @@ Keep `modsim/__init__.py`: `mkdocs.yml` documents `::: modsim`, which imports th
123122

124123
---
125124

125+
## Task 6: CI and build fixes
126+
127+
**Status:** Done (2026-10-13)
128+
129+
- The first CI run with the `modsim` unit tests in `make tests` failed: `vector_cross` on 2D vectors raised `ValueError` under NumPy 2.x (`np.cross` dropped 2D support), and `Vector` is label-indexed under pandas 3. Fixed in `modsim/modsim.py` and copied everywhere. No notebook calls `vector_cross`
130+
- Build scripts only commit; `make build` pushes ModSimPy once, so CI runs once on the finished state instead of three times on partial ones
131+
- `make build` runs `examples` before `chapters`: `chapters/build.sh` builds `ModSimPyNotebooks.zip`, which includes the examples, and used to zip the previous versions
132+
- CI in both repos: one Python version, the current Colab one (3.13; check `googlecolab/backend-info`, `os-info.txt`), on Ubuntu and Windows; `actions/checkout@v5`, `actions/setup-python@v6`
133+
126134
## Notes
127135

128136
- The three repos: **ModSimPy** (this one, public, `master`), **ModSimPySolutions** (private, `master`; CI runs the notebooks monthly and on push — all passing through 2026-10-01), **ModSim** (shared figures and data, `main`).

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Here is the [home page for this book at Green Tea Press](https://greenteapress.c
1010

1111
[Read documentation of the `modsim.py` module](https://allendowney.github.io/ModSimPy/api/index.html)
1212

13+
The notebooks download `modsim.py` from this repository, so there is nothing to install. The `modsimpy` package on PyPI (last released in 2020) is outdated and no longer maintained.
14+
1315

1416
## Outline
1517

‎README.rst‎

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

‎setup.py‎

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

0 commit comments

Comments
 (0)