Skip to content
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

Jump to bottom

Fix kernel issue #229

Merged
merged 5 commits into from
Aug 19, 2024
Merged

Fix kernel issue #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db20d33
Update pyproject.toml
tpike3 Aug 19, 2024
05cf096
Update intro_tutorial.ipynb
tpike3 Aug 19, 2024
6b95427
Prevent nbsphinx run
tpike3 Aug 19, 2024
3b728de
Update intro_tutorial.ipynb
tpike3 Aug 19, 2024
7cc65fe
Improve
tpike3 Aug 19, 2024
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
177 changes: 0 additions & 177 deletions docs/Makefile
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,7 @@
# keep_warnings = False
# --- Options for nbsphinx -----------------------------------------------

# prevents cell run time taking too long
nb_execution_timeout = 60
# uses cached information
nb_execution_mode = "cache"
# ensures there is not a conflict if user has multiple kernels
nbsphinx_kernel_name = 'python-upstream-dev'
nbsphinc_execute = 'never'

# -- Options for HTML output ----------------------------------------------

Expand Down
20 changes: 9 additions & 11 deletions docs/tutorials/intro_tutorial.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"- Recovery Rate (time infection lasts)\n",
"- Mobility (distance agent moves)\n",
"\n",
"### The tutorial then proceeds in three parts: \n",
"**The tutorial then proceeds in three parts:** \n",
"- Part 1 Create the Basic Model \n",
"- Part 2 Add Agent Behaviors and Model Complexity \n",
"- Part 3 Add Visualizations and Interface\n",
Expand All @@ -39,22 +39,20 @@
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "c0c702b3-c307-4f00-9530-468e29f53184",
"cell_type": "raw",
"id": "0b098d27-39cd-41a3-b171-f525c6035d94",
"metadata": {},
"outputs": [],
"source": [
"#Run this if in colab\n",
"!pip install mesa\n",
"!pip install mesa-geo\n",
"#Run this if in colab (make it is a code cell) \n",
"!pip install mesa --quiet\n",
"!pip install mesa-geo --quiet\n",
"!mkdir -p data\n",
"!wget -P data https://raw.githubusercontent.com/projectmesa/mesa-geo/tree/main/docs/tutorials/data/TorontoNeighbourhoods.geojson"
]
},
{
"cell_type": "markdown",
"id": "3f1b8324-9849-4992-b13a-db9a94372d0a",
"id": "163711a0-3d78-4fdd-964d-07f9dd88b9d4",
"metadata": {},
"source": [
"## Part 1 Create the Basic Model\n",
Expand Down Expand Up @@ -1111,9 +1109,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Xeus-Python (Python 3.10)",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "mesa_geo"
"name": "python3"
},
"language_info": {
"codemirror_mode": {
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ dev = [
docs = [
"sphinx",
"ipython",
"ipykernel", # necessary to ensure python3 kernel
"pydata_sphinx_theme",
"seaborn",
"myst-nb",
Expand Down