Skip to content

Commit cf5c683

Browse files
committed
Debug doc building [makedocs]
1 parent d84090d commit cf5c683

6 files changed

Lines changed: 59 additions & 13 deletions

File tree

HOW_TO_RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101

102102
The process of creating and tagging a release will automatically
103103
trigger various GitHub Actions scripts to build, test, and publish the
104-
new release to PyPI and conda forge, assuming there are no errors.
104+
new release to PyPI, assuming there are no errors.
105105

106106
10. Build the ActivitySim Standalone Windows Installer. This is done using
107107
GitHub Actions, but it is not done automatically when a release is created,

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ and benefit from contributions of other agency partners.
1515

1616
:fire: The `main` branch of this repository contains the Consortium's latest
1717
in-development codebase. It is not necessarily what you'll get if you install released
18-
code from conda-forge or by downloading one of the "release" versions here on GitHub,
18+
code from PyPI or by downloading one of the "release" versions here on GitHub,
1919
but it is generally expected that code in the `main` branch should be usable.
2020

2121
## Helpful Links

docs/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ SPHINXBUILD = uv run --project .. sphinx-build
77
PAPER =
88
BUILDDIR = _build
99

10-
# User-friendly check for sphinx-build
11-
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
12-
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
13-
endif
14-
1510
# Internal variables.
1611
PAPEROPT_a4 = -D latex_paper_size=a4
1712
PAPEROPT_letter = -D latex_paper_size=letter

docs/users-guide/modelsetup.rst

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ assumes the user is more experienced in running travel demand models and profici
1616
used ActivitySim or has not used recent versions of ActivitySim. More detailed instructions for installing
1717
and running ActivitySim are also available in this Users Guide.
1818

19-
* Use the :ref:`Pre-packaged Installer`
19+
* Use the :ref:`pre-packaged installer`
2020
* :ref:`Run the Primary Example`
2121
* Placeholder (Edit model input files, configs, as needed)
2222

@@ -88,9 +88,12 @@ Installing ActivitySim
8888

8989
There are two recommended ways to install ActivitySim:
9090

91-
1. Using a :ref:`Pre-packaged Installer` (recommended for users who do not need to change the Python code)
91+
1. Using a :ref:`pre-packaged installer`
9292

93-
2. Using a :ref:`Python the uv package and project manager` (recommended for users who need to change/customize the Python code)
93+
2. Using a :ref:`Python the uv package and project manager`
94+
95+
The first is recommended for users who do not need to change the Python code and are on Windows,
96+
and the second is recommended for users who need to change/customize the Python code.
9497

9598

9699
Pre-packaged Installer
@@ -130,12 +133,14 @@ environment management including installation and management of Python
130133
versions and dependency locking. The steps involved are described as follows:
131134

132135
1. Install *uv*. Instructions can be found
133-
`here <https://docs.astral.sh/uv/getting-started/installation/>`.
136+
`here <https://docs.astral.sh/uv/getting-started/installation/>`_.
134137

135138
2. Clone the ActivitySim project using Git. (If Git is not installed,
136-
instructions can be found `here <https://git-scm.com/downloads>`.)
139+
instructions can be found `here <https://git-scm.com/downloads>`_.)
140+
141+
::
137142

138-
git clone https://github.com/ActivitySim/activitysim.git
143+
git clone https://github.com/ActivitySim/activitysim.git
139144
cd activitysim
140145

141146
3. Optionally create the virtual environment. This is created automatically
@@ -146,25 +151,33 @@ want to install the project in a non-editable mode so that users on
146151
your machine cannot accidentally change the source code, use the
147152
`--no-editable` option.)
148153

154+
::
155+
149156
uv sync --no-editable
150157

151158
4. Run an ActivitySim command using the following. (This will automatically
152159
create a virtual environment from the lockfile, if it does not already
153160
exist.)
154161

162+
::
163+
155164
uv run ...
156165

157166
For example, run the ActivitySim commandline using the following, which
158167
makes sure the code is run within the correct (locked) Python environment.
159168
More information about the commandline interface is available in
160169
the :ref:`Ways to Run the Model` section.
161170

171+
::
172+
162173
uv run activitysim run -c configs -o output -d data
163174

164175
If you want to run ActivitySim from a directory different than where the
165176
code lives, use the `project` option to point *uv* to this project using
166177
relative paths:
167178

179+
::
180+
168181
uv run --project relative/path/to/activitysim/code activitysim run -c configs -o output -d data
169182

170183
For more on *uv*, visit https://docs.astral.sh/uv/.

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ convention = "numpy"
101101
[dependency-groups]
102102
dev = [
103103
"altair",
104+
"autodoc_pydantic",
104105
"asv", # for benchmarking
105106
"black==22.12.0,<23",
106107
"bump2version", # for making a release

uv.lock

Lines changed: 37 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)