From fe2614d41f674fc38d2d693523e80f8cc5fad4a1 Mon Sep 17 00:00:00 2001 From: Ben Stabler Date: Thu, 10 Sep 2020 12:37:34 -0700 Subject: [PATCH] publish (#344) * move notebooks to examples folder so they are installed and update docs as a result (#343) --- MANIFEST.in | 2 +- activitysim/__init__.py | 2 +- .../examples/example_mtc/notebooks}/README.md | 0 .../example_mtc/notebooks}/adding_tncs.ipynb | 0 .../notebooks}/change_in_auto_ownership.ipynb | 0 .../example_mtc/notebooks}/getting_started.ipynb | 2 +- .../notebooks}/summarizing_results.ipynb | 0 .../notebooks}/trips_in_time_and_space.ipynb | 0 .../zone_shapefile/bayarea_rtaz1454_rev1.dbf | Bin .../zone_shapefile/bayarea_rtaz1454_rev1.prj | 0 .../zone_shapefile/bayarea_rtaz1454_rev1.shp | Bin .../zone_shapefile/bayarea_rtaz1454_rev1.shx | Bin docs/gettingstarted.rst | 10 +++++----- 13 files changed, 8 insertions(+), 8 deletions(-) rename {notebooks => activitysim/examples/example_mtc/notebooks}/README.md (100%) rename {notebooks => activitysim/examples/example_mtc/notebooks}/adding_tncs.ipynb (100%) rename {notebooks => activitysim/examples/example_mtc/notebooks}/change_in_auto_ownership.ipynb (100%) rename {notebooks => activitysim/examples/example_mtc/notebooks}/getting_started.ipynb (99%) rename {notebooks => activitysim/examples/example_mtc/notebooks}/summarizing_results.ipynb (100%) rename {notebooks => activitysim/examples/example_mtc/notebooks}/trips_in_time_and_space.ipynb (100%) rename {notebooks => activitysim/examples/example_mtc/notebooks}/zone_shapefile/bayarea_rtaz1454_rev1.dbf (100%) rename {notebooks => activitysim/examples/example_mtc/notebooks}/zone_shapefile/bayarea_rtaz1454_rev1.prj (100%) rename {notebooks => activitysim/examples/example_mtc/notebooks}/zone_shapefile/bayarea_rtaz1454_rev1.shp (100%) rename {notebooks => activitysim/examples/example_mtc/notebooks}/zone_shapefile/bayarea_rtaz1454_rev1.shx (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 051dfb3f6..0c83cbffd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ + include ez_setup.py include README.rst -graft notebooks graft activitysim/examples # required for test system diff --git a/activitysim/__init__.py b/activitysim/__init__.py index 0d097ba6c..392063b47 100644 --- a/activitysim/__init__.py +++ b/activitysim/__init__.py @@ -1,5 +1,5 @@ # ActivitySim # See full license in LICENSE.txt. -__version__ = '0.9.5' +__version__ = '0.9.5.1' __doc__ = 'Activity-Based Travel Modeling' diff --git a/notebooks/README.md b/activitysim/examples/example_mtc/notebooks/README.md similarity index 100% rename from notebooks/README.md rename to activitysim/examples/example_mtc/notebooks/README.md diff --git a/notebooks/adding_tncs.ipynb b/activitysim/examples/example_mtc/notebooks/adding_tncs.ipynb similarity index 100% rename from notebooks/adding_tncs.ipynb rename to activitysim/examples/example_mtc/notebooks/adding_tncs.ipynb diff --git a/notebooks/change_in_auto_ownership.ipynb b/activitysim/examples/example_mtc/notebooks/change_in_auto_ownership.ipynb similarity index 100% rename from notebooks/change_in_auto_ownership.ipynb rename to activitysim/examples/example_mtc/notebooks/change_in_auto_ownership.ipynb diff --git a/notebooks/getting_started.ipynb b/activitysim/examples/example_mtc/notebooks/getting_started.ipynb similarity index 99% rename from notebooks/getting_started.ipynb rename to activitysim/examples/example_mtc/notebooks/getting_started.ipynb index 3246b9b75..008e18c76 100644 --- a/notebooks/getting_started.ipynb +++ b/activitysim/examples/example_mtc/notebooks/getting_started.ipynb @@ -75,7 +75,7 @@ } ], "source": [ - "!pip install https://github.com/activitysim/activitysim/zipball/develop" + "!pip install activitysim" ] }, { diff --git a/notebooks/summarizing_results.ipynb b/activitysim/examples/example_mtc/notebooks/summarizing_results.ipynb similarity index 100% rename from notebooks/summarizing_results.ipynb rename to activitysim/examples/example_mtc/notebooks/summarizing_results.ipynb diff --git a/notebooks/trips_in_time_and_space.ipynb b/activitysim/examples/example_mtc/notebooks/trips_in_time_and_space.ipynb similarity index 100% rename from notebooks/trips_in_time_and_space.ipynb rename to activitysim/examples/example_mtc/notebooks/trips_in_time_and_space.ipynb diff --git a/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.dbf b/activitysim/examples/example_mtc/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.dbf similarity index 100% rename from notebooks/zone_shapefile/bayarea_rtaz1454_rev1.dbf rename to activitysim/examples/example_mtc/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.dbf diff --git a/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.prj b/activitysim/examples/example_mtc/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.prj similarity index 100% rename from notebooks/zone_shapefile/bayarea_rtaz1454_rev1.prj rename to activitysim/examples/example_mtc/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.prj diff --git a/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.shp b/activitysim/examples/example_mtc/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.shp similarity index 100% rename from notebooks/zone_shapefile/bayarea_rtaz1454_rev1.shp rename to activitysim/examples/example_mtc/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.shp diff --git a/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.shx b/activitysim/examples/example_mtc/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.shx similarity index 100% rename from notebooks/zone_shapefile/bayarea_rtaz1454_rev1.shx rename to activitysim/examples/example_mtc/notebooks/zone_shapefile/bayarea_rtaz1454_rev1.shx diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst index 84eee02e5..7e16d69eb 100644 --- a/docs/gettingstarted.rst +++ b/docs/gettingstarted.rst @@ -133,12 +133,12 @@ ActivitySim includes a `Jupyter Notebook `__ recipe book wi * Open an Anaconda prompt and activate the Anaconda environment with ActivitySim installed * If needed, ``conda install jupyterlab`` so you can run jupyter notebooks * Type ``jupyter notebook`` to launch the web-based notebook manager -* Navigate to the notebooks folder and select a notebook to learn more: +* Navigate to the examples notebooks folder and select a notebook to learn more: - * `Getting started `__ - * `Summarizing results `__ - * `Testing a change in auto ownership `__ - * `Adding TNCs `__ + * `Getting started `__ + * `Summarizing results `__ + * `Testing a change in auto ownership `__ + * `Adding TNCs `__ Hardware --------