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.

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

Integrate Jupyter Lite and Colab #204

Closed
wants to merge 159 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
a75ab09
- add geoexperimental to include jupyter viz
tpike3 Apr 7, 2024
87af7ae
* remove extraneous folders
tpike3 Apr 7, 2024
ef6286a
Update __init__.py
tpike3 Apr 7, 2024
4a69041
* remove extraneous code
tpike3 Apr 8, 2024
c0c58a2
remove duplicate code and import from mesa
tpike3 Apr 9, 2024
228344b
* change the tutorial to geo schelling
tpike3 Apr 16, 2024
c77f2ff
Merge branch 'projectmesa:main' into main
tpike3 May 8, 2024
839bb9f
update for Mesa 2.3
tpike3 May 11, 2024
9fe214f
remove legacy visualization module
tpike3 May 11, 2024
ae4219e
Update intro_tutorial_colab.ipynb
tpike3 May 11, 2024
967b096
remove explanatory
tpike3 Jun 4, 2024
56d789f
Here wo go again
tpike3 Jun 4, 2024
49c4154
remove for trying
tpike3 Jun 4, 2024
733731c
update
tpike3 Jun 4, 2024
8dab524
again
tpike3 Jun 5, 2024
543a5c1
Working copy for tutorial
tpike3 Jun 5, 2024
8c91790
again
tpike3 Jun 5, 2024
0729dc6
try conda install
tpike3 Jun 5, 2024
7e321f1
Update .readthedocs.yml
tpike3 Jun 5, 2024
d0a0876
Update environment.yml
tpike3 Jun 5, 2024
e7eba71
Update environment.yml
tpike3 Jun 5, 2024
5f7db59
Update environment.yml
tpike3 Jun 5, 2024
23c7c70
Update .readthedocs.yml
tpike3 Jun 5, 2024
464e2f1
Create environment.yml
tpike3 Jun 5, 2024
7ca70c1
Update .readthedocs.yml
tpike3 Jun 5, 2024
956af62
Update .readthedocs.yml
tpike3 Jun 5, 2024
0730327
Update .readthedocs.yml
tpike3 Jun 5, 2024
5bbb524
pffft.. FML
tpike3 Jun 5, 2024
285e853
Update .readthedocs.yml
tpike3 Jun 5, 2024
a197d74
sdefpjd
tpike3 Jun 5, 2024
767decc
le sigh
tpike3 Jun 5, 2024
f855602
at least I got a different error
tpike3 Jun 5, 2024
608c7a6
Update .readthedocs.yml
tpike3 Jun 5, 2024
e44ea15
again
tpike3 Jun 7, 2024
d23044b
again2
tpike3 Jun 7, 2024
fbc440b
again3
tpike3 Jun 7, 2024
237a2bb
Update .readthedocs.yml
tpike3 Jun 8, 2024
32842f3
update path
tpike3 Jun 8, 2024
6d74d1e
again5
tpike3 Jun 8, 2024
c5b14cd
again6
tpike3 Jun 8, 2024
b06ed10
Update .readthedocs.yml
tpike3 Jun 8, 2024
b8243c6
build 112
tpike3 Jun 8, 2024
2f14ced
Update .readthedocs.yml
tpike3 Jun 8, 2024
302ead1
Update .readthedocs.yml
tpike3 Jun 8, 2024
2bc1c34
Update pyproject.toml
tpike3 Jun 8, 2024
db1ed65
Update .readthedocs.yml
tpike3 Jun 8, 2024
d657427
Update pyproject.toml
tpike3 Jun 8, 2024
032c968
set up an environment
tpike3 Jun 8, 2024
debfbaf
add sdist
tpike3 Jun 8, 2024
151be08
try again
tpike3 Jun 8, 2024
d351105
Update intro_tutorial.ipynb
tpike3 Jun 8, 2024
40e6c6b
again 120
tpike3 Jun 8, 2024
f50aad8
Update .readthedocs.yml
tpike3 Jun 8, 2024
f94113a
Update .readthedocs.yml
tpike3 Jun 8, 2024
c574100
Update .readthedocs.yml
tpike3 Jun 8, 2024
99aece3
Update .readthedocs.yml
tpike3 Jun 8, 2024
2bfd380
Update .readthedocs.yml
tpike3 Jun 9, 2024
d2b3827
Update .readthedocs.yml
tpike3 Jun 9, 2024
97ac255
Update environment.yml
tpike3 Jun 9, 2024
d9f1a99
Update environment.yml
tpike3 Jun 9, 2024
18534c2
Update environment.yml
tpike3 Jun 9, 2024
8e2ce03
Update environment.yml
tpike3 Jun 9, 2024
c1eb211
Update pyproject.toml
tpike3 Jun 9, 2024
dea2553
Update pyproject.toml
tpike3 Jun 9, 2024
d657359
Update pyproject.toml
tpike3 Jun 9, 2024
4b986ac
Update pyproject.toml
tpike3 Jun 9, 2024
35a0169
Update pyproject.toml
tpike3 Jun 9, 2024
2feced7
Update pyproject.toml
tpike3 Jun 9, 2024
16ca8f5
Update setup.cfg
tpike3 Jun 9, 2024
a4d4efd
Update conf.py
tpike3 Jun 9, 2024
4149e78
Update conf.py
tpike3 Jun 9, 2024
b6150b5
Update environment.yml
tpike3 Jun 9, 2024
8f7550c
Update environment.yml
tpike3 Jun 9, 2024
69df1f5
Update conf.py
tpike3 Jun 9, 2024
cd5a92b
Create index.md
tpike3 Jun 9, 2024
bf427a1
fix paths
tpike3 Jun 15, 2024
cebf43f
updates
tpike3 Jun 15, 2024
6973b1a
Update overview.md
tpike3 Jun 15, 2024
260cc76
update extensions
tpike3 Jun 15, 2024
0faf528
more updates
tpike3 Jun 15, 2024
031611c
Update environment.yml
tpike3 Jun 15, 2024
9890c92
Update environment.yml
tpike3 Jun 15, 2024
5480df5
Update environment.yml
tpike3 Jun 15, 2024
26accbf
Update environment.yml
tpike3 Jun 15, 2024
1280c39
Update environment.yml
tpike3 Jun 15, 2024
3318046
Update environment.yml
tpike3 Jun 15, 2024
87d7787
Update conf.py
tpike3 Jun 15, 2024
93997f2
updates
tpike3 Jun 15, 2024
dcb6a55
Update environment.yml
tpike3 Jun 15, 2024
62277f8
MORE UPDATES
tpike3 Jun 16, 2024
1887b9c
Update environment.yml
tpike3 Jun 16, 2024
115a633
Update environment.yml
tpike3 Jun 16, 2024
86e976b
Update environment.yml
tpike3 Jun 16, 2024
4b8a294
Update environment.yml
tpike3 Jun 16, 2024
29f8c3c
kernel search
tpike3 Jun 16, 2024
7fc1df7
Update conf.py
tpike3 Jun 16, 2024
b921b1f
Update conf.py
tpike3 Jun 16, 2024
fb62639
someday
tpike3 Jun 16, 2024
e0b160c
Update environment.yml
tpike3 Jun 16, 2024
f1d4150
Update environment.yml
tpike3 Jun 16, 2024
d76f568
updates
tpike3 Jun 16, 2024
9b83830
updates
tpike3 Jun 17, 2024
ac464f3
Update .readthedocs.yml
tpike3 Jun 17, 2024
941394a
Update .readthedocs.yml
tpike3 Jun 17, 2024
c5f8d9b
focus on path
tpike3 Jun 17, 2024
bf8ea1d
try different arrangement
tpike3 Jun 17, 2024
f1a97c1
try again
tpike3 Jun 17, 2024
23539c4
Update environment.yml
tpike3 Jun 17, 2024
1863452
reduce size?
tpike3 Jun 17, 2024
9c73f70
Update conf.py
tpike3 Jun 17, 2024
8ea28e4
Update conf.py
tpike3 Jun 17, 2024
0d9834b
try different set up
tpike3 Jun 17, 2024
797e981
Update .readthedocs.yml
tpike3 Jun 17, 2024
2087a14
Revert "Update .readthedocs.yml"
tpike3 Jun 17, 2024
558e0bc
Revert "try different set up"
tpike3 Jun 17, 2024
ebaaee8
Update conf.py
tpike3 Jun 17, 2024
597008f
Update setup.py
tpike3 Jun 17, 2024
00ef989
correct ruff issues
tpike3 Jun 18, 2024
1ba0379
update build approach
tpike3 Jun 18, 2024
6d705ad
no idea
tpike3 Jun 19, 2024
1cefa6d
lets try
tpike3 Jun 19, 2024
17722e8
halluncination
tpike3 Jun 19, 2024
4ce9fa7
Delete intro_tutorial.ipynb
tpike3 Jun 19, 2024
b134373
Update .readthedocs.yml
tpike3 Jun 19, 2024
3315086
Update conf.py
tpike3 Jun 19, 2024
a27bee3
debug attempt
tpike3 Jun 19, 2024
fdfceb5
debug2
tpike3 Jun 19, 2024
7950f0e
Update environment.yml
tpike3 Jun 19, 2024
a10c3cd
debug4
tpike3 Jun 19, 2024
252d386
Update .readthedocs.yml
tpike3 Jun 19, 2024
2c4fc9e
Update .readthedocs.yml
tpike3 Jun 19, 2024
cd34e19
Update .readthedocs.yml
tpike3 Jun 19, 2024
dfb113f
Update .readthedocs.yml
tpike3 Jun 19, 2024
490fdff
Update environment.yml
tpike3 Jun 21, 2024
6aa5991
Update .readthedocs.yml
tpike3 Jun 21, 2024
4918e5f
fix dependencies
tpike3 Jun 21, 2024
bb7db99
recalibrate
tpike3 Jun 21, 2024
591014c
Update environment.yml
tpike3 Jun 21, 2024
b9ea99f
Update environment.yml
tpike3 Jun 21, 2024
8fb7c30
Update environment.yml
tpike3 Jun 21, 2024
e23c57c
Update environment.yml
tpike3 Jun 21, 2024
18985a1
Update environment.yml
tpike3 Jun 21, 2024
0b3c737
back to this morning
tpike3 Jun 21, 2024
139d4d1
agsoniu
tpike3 Jun 21, 2024
e02df03
Update .readthedocs.yml
tpike3 Jun 21, 2024
8ce3ca6
Update environment.yml
tpike3 Jun 22, 2024
ca252a5
update abillion
tpike3 Jun 22, 2024
5c1c3e8
Update environment.yml
tpike3 Jun 22, 2024
e746276
wild attempt
tpike3 Jun 22, 2024
61a4114
convert to hatch build
tpike3 Jun 22, 2024
2feb77f
Update .readthedocs.yml
tpike3 Jun 22, 2024
e6030ff
again
tpike3 Jun 22, 2024
87bdf8a
Update environment.yml
tpike3 Jun 22, 2024
67d8b9b
Update environment.yml
tpike3 Jun 22, 2024
4e2c89d
revert to pyodide
tpike3 Jun 22, 2024
67626b7
Update .readthedocs.yml
tpike3 Jun 22, 2024
73e8ad2
revert to xeus
tpike3 Jun 22, 2024
9085648
update APIs
tpike3 Jun 22, 2024
a1328c1
Update again
tpike3 Jun 22, 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
48 changes: 48 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build and Deploy

on:
push:
branches:
- main
pull_request:
branches:
- '*'

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install the dependencies
run: |
python -m pip install -r requirements.txt
- name: Build the JupyterLite site
run: |
cp README.md content
jupyter lite build --contents content --output-dir dist
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: ./dist

deploy:
needs: build
if: github.ref == 'refs/heads/main'
permissions:
pages: write
id-token: write

environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

runs-on: ubuntu-latest
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ __pycache__/
# Distribution / packaging
.Python
build/
docs/build
develop-eggs/
dist/
downloads/
Expand Down Expand Up @@ -329,3 +330,8 @@ pip-log.txt
mesa_geo/visualization/templates/css/*
mesa_geo/visualization/templates/js/*
!mesa_geo/visualization/templates/js/MapModule.js

# Jupyter Lite files
.jupyterlite.doit.db
*.jupyterlite.doit.db
.virtual_documents
1 change: 1 addition & 0 deletions .nojekyll
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

25 changes: 11 additions & 14 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
# Read the Docs configuration file
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# Optionally build your docs in additional formats such as PDF
formats:
- pdf

build:
os: "ubuntu-22.04"
os: "ubuntu-20.04"
tools:
python: "3.9"
python: "mambaforge-4.10"

# Optionally set the version of Python and requirements required to build your docs
python:
install:
- method: pip
path: .
extra_requirements:
- docs

conda:
environment: docs/source/environment.yml

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/source/conf.py
fail_on_warning: false
177 changes: 0 additions & 177 deletions docs/Makefile

This file was deleted.

44 changes: 0 additions & 44 deletions docs/README.md

This file was deleted.

16 changes: 0 additions & 16 deletions docs/apis/visualization.rst

This file was deleted.

Loading
Loading