diff --git a/README.md b/README.md index dfa83bf..ac3a0a2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ -# ``carculator_bus`` -

- +

@@ -12,6 +10,9 @@

+# ``carculator_bus`` + + Prospective environmental and economic life cycle assessment of urban and coach buses. A fully parameterized Python model developed by the [Technology Assessment group](https://www.psi.ch/en/ta) of the diff --git a/docs/_static/img/energy_model.png b/docs/_static/img/energy_model.png index e69de29..2c16542 100644 Binary files a/docs/_static/img/energy_model.png and b/docs/_static/img/energy_model.png differ diff --git a/docs/_static/img/favicon.png b/docs/_static/img/favicon.png index e69de29..260b35b 100644 Binary files a/docs/_static/img/favicon.png and b/docs/_static/img/favicon.png differ diff --git a/docs/_static/img/hybrid_efficiency.png b/docs/_static/img/hybrid_efficiency.png index e69de29..0a7e7a0 100644 Binary files a/docs/_static/img/hybrid_efficiency.png and b/docs/_static/img/hybrid_efficiency.png differ diff --git a/docs/_static/img/image_1.png b/docs/_static/img/image_1.png index e69de29..892ddb0 100644 Binary files a/docs/_static/img/image_1.png and b/docs/_static/img/image_1.png differ diff --git a/docs/_static/img/image_10.png b/docs/_static/img/image_10.png index e69de29..ed4fd60 100644 Binary files a/docs/_static/img/image_10.png and b/docs/_static/img/image_10.png differ diff --git a/docs/_static/img/image_11.png b/docs/_static/img/image_11.png index e69de29..b8a4b18 100644 Binary files a/docs/_static/img/image_11.png and b/docs/_static/img/image_11.png differ diff --git a/docs/_static/img/image_12.png b/docs/_static/img/image_12.png index e69de29..cda3b0e 100644 Binary files a/docs/_static/img/image_12.png and b/docs/_static/img/image_12.png differ diff --git a/docs/_static/img/image_13.png b/docs/_static/img/image_13.png index e69de29..b7e7fea 100644 Binary files a/docs/_static/img/image_13.png and b/docs/_static/img/image_13.png differ diff --git a/docs/_static/img/image_14.png b/docs/_static/img/image_14.png index e69de29..c2c027c 100644 Binary files a/docs/_static/img/image_14.png and b/docs/_static/img/image_14.png differ diff --git a/docs/_static/img/image_15.png b/docs/_static/img/image_15.png index e69de29..a2ed8c6 100644 Binary files a/docs/_static/img/image_15.png and b/docs/_static/img/image_15.png differ diff --git a/docs/_static/img/image_16.png b/docs/_static/img/image_16.png index e69de29..078bfcf 100644 Binary files a/docs/_static/img/image_16.png and b/docs/_static/img/image_16.png differ diff --git a/docs/_static/img/image_17.png b/docs/_static/img/image_17.png index e69de29..74578e0 100644 Binary files a/docs/_static/img/image_17.png and b/docs/_static/img/image_17.png differ diff --git a/docs/_static/img/image_18.png b/docs/_static/img/image_18.png index e69de29..9961764 100644 Binary files a/docs/_static/img/image_18.png and b/docs/_static/img/image_18.png differ diff --git a/docs/_static/img/image_19.png b/docs/_static/img/image_19.png index e69de29..af60dfe 100644 Binary files a/docs/_static/img/image_19.png and b/docs/_static/img/image_19.png differ diff --git a/docs/_static/img/image_2.png b/docs/_static/img/image_2.png index e69de29..2ac00ca 100644 Binary files a/docs/_static/img/image_2.png and b/docs/_static/img/image_2.png differ diff --git a/docs/_static/img/image_20.png b/docs/_static/img/image_20.png index e69de29..cf71176 100644 Binary files a/docs/_static/img/image_20.png and b/docs/_static/img/image_20.png differ diff --git a/docs/_static/img/image_21.png b/docs/_static/img/image_21.png index e69de29..aa08efb 100644 Binary files a/docs/_static/img/image_21.png and b/docs/_static/img/image_21.png differ diff --git a/docs/_static/img/image_22.png b/docs/_static/img/image_22.png index e69de29..cc41e80 100644 Binary files a/docs/_static/img/image_22.png and b/docs/_static/img/image_22.png differ diff --git a/docs/_static/img/image_23.png b/docs/_static/img/image_23.png index e69de29..69ed7c8 100644 Binary files a/docs/_static/img/image_23.png and b/docs/_static/img/image_23.png differ diff --git a/docs/_static/img/image_24.png b/docs/_static/img/image_24.png index e69de29..088246b 100644 Binary files a/docs/_static/img/image_24.png and b/docs/_static/img/image_24.png differ diff --git a/docs/_static/img/image_25.png b/docs/_static/img/image_25.png index e69de29..2713dc7 100644 Binary files a/docs/_static/img/image_25.png and b/docs/_static/img/image_25.png differ diff --git a/docs/_static/img/image_26.png b/docs/_static/img/image_26.png index e69de29..6f5cd97 100644 Binary files a/docs/_static/img/image_26.png and b/docs/_static/img/image_26.png differ diff --git a/docs/_static/img/image_3.png b/docs/_static/img/image_3.png index e69de29..6fa8e1e 100644 Binary files a/docs/_static/img/image_3.png and b/docs/_static/img/image_3.png differ diff --git a/docs/_static/img/image_4.png b/docs/_static/img/image_4.png index e69de29..fe35bc3 100644 Binary files a/docs/_static/img/image_4.png and b/docs/_static/img/image_4.png differ diff --git a/docs/_static/img/image_5.png b/docs/_static/img/image_5.png index e69de29..cf344d3 100644 Binary files a/docs/_static/img/image_5.png and b/docs/_static/img/image_5.png differ diff --git a/docs/_static/img/image_6.png b/docs/_static/img/image_6.png index e69de29..685c80c 100644 Binary files a/docs/_static/img/image_6.png and b/docs/_static/img/image_6.png differ diff --git a/docs/_static/img/image_7.png b/docs/_static/img/image_7.png index e69de29..f3d7c18 100644 Binary files a/docs/_static/img/image_7.png and b/docs/_static/img/image_7.png differ diff --git a/docs/_static/img/image_8.png b/docs/_static/img/image_8.png index e69de29..14ae343 100644 Binary files a/docs/_static/img/image_8.png and b/docs/_static/img/image_8.png differ diff --git a/docs/_static/img/image_9.png b/docs/_static/img/image_9.png index e69de29..416eccb 100644 Binary files a/docs/_static/img/image_9.png and b/docs/_static/img/image_9.png differ diff --git a/docs/_static/img/mediumsmall.png b/docs/_static/img/mediumsmall.png index e69de29..21e1cca 100644 Binary files a/docs/_static/img/mediumsmall.png and b/docs/_static/img/mediumsmall.png differ diff --git a/docs/_static/img/mediumsmall_2.png b/docs/_static/img/mediumsmall_2.png index e69de29..ef9d539 100644 Binary files a/docs/_static/img/mediumsmall_2.png and b/docs/_static/img/mediumsmall_2.png differ diff --git a/docs/_static/img/urban_gwp.png b/docs/_static/img/urban_gwp.png index e69de29..7e79d55 100644 Binary files a/docs/_static/img/urban_gwp.png and b/docs/_static/img/urban_gwp.png differ diff --git a/docs/_static/img/vecto_validation.png b/docs/_static/img/vecto_validation.png index e69de29..2895f11 100644 Binary files a/docs/_static/img/vecto_validation.png and b/docs/_static/img/vecto_validation.png differ diff --git a/docs/_static/resources/Kraftstoffstudie.pdf b/docs/_static/resources/Kraftstoffstudie.pdf deleted file mode 100644 index e69de29..0000000 diff --git a/docs/_static/resources/examples.zip b/docs/_static/resources/examples.zip index e69de29..94a38bc 100644 Binary files a/docs/_static/resources/examples.zip and b/docs/_static/resources/examples.zip differ diff --git a/docs/_static/resources/template_workbook.zip b/docs/_static/resources/template_workbook.zip index e69de29..5cce657 100644 Binary files a/docs/_static/resources/template_workbook.zip and b/docs/_static/resources/template_workbook.zip differ diff --git a/docs/conf.py b/docs/conf.py index b0b05a9..cadac80 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,10 +55,10 @@ # -- Options for HTML output ------------------------------------------------- -# The theme to use for HTML and HTML Help pages. See the documentation for +# The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -# The theme to use for HTML and HTML Help pages. See the documentation for +# The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. html_logo = "_static/img/mediumsmall.png" html_favicon = "_static/img/favicon.png" @@ -75,7 +75,6 @@ "site_url": "https://carculator-bus.readthedocs.io", "repo_url": "https://github.com/romainsacchi/carculator_bus/", "repo_name": "romainsacchi/carculator_bus", - "repo_type": "github", "edit_uri": "blob/master/docs/", "globaltoc_collapse": True, "features": ["navigation.top", "search.share", "navigation.tracking", "toc.follow"], diff --git a/docs/index.rst b/docs/index.rst index 2904bf0..75dd49d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,6 +1,17 @@ .. image:: /_static/img/mediumsmall_2.png :align: center +.. raw:: html + +

+ + + + + +

+ + .. _intro: Carculator Bus diff --git a/readthedocs.yml b/readthedocs.yml index a39b16f..a26ce7f 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -18,7 +18,7 @@ sphinx: # Set the requirements required to build your docs python: install: - - requirements: requirements.txt + - requirements: docs/docs_requirements.txt - method: pip path: . - - requirements: docs/docs_requirements.txt + - requirements: requirements.txt