Merge pull request #726 from PyPSA/develop

`v0.8.0` Release Candidate

Author: trevorb1

.pre-commit-ci.yaml

@@ -1 +1 @@
-autoupdate_branch: develop
+autoupdate_branch: develop

.pre-commit-config.yaml

@@ -12,18 +12,18 @@ repos:
     args: ['--maxkb=10000']
 
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.15.0
+  rev: v2.16.0
   hooks:
   - id: pretty-format-yaml
     args: [--autofix, --indent, "2", --preserve-quotes]
 
 - repo: https://github.com/asottile/add-trailing-comma
-  rev: v3.2.0
+  rev: v4.0.0
   hooks:
   - id: add-trailing-comma
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.20.0
+  rev: v3.21.2
   hooks:
   - id: pyupgrade
     args: [--py39-plus]
@@ -35,17 +35,19 @@ repos:
     exclude: examples/solve-on-remote.ipynb
 
 - repo: https://github.com/snakemake/snakefmt
-  rev: v0.11.0
+  rev: v0.11.3
   hooks:
   - id: snakefmt
 
 - repo: https://github.com/keewis/blackdoc
-  rev: v0.4.1
+  rev: v0.4.6
   hooks:
   - id: blackdoc
+    # additional_dependencies:
+    # - black==23.12.1
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.12.9  # Check for the latest version
+  rev: v0.15.0  # Check for the latest version
   hooks:
   - id: ruff
     args: ["--config=pyproject.toml", "--fix"]

docs/source/_static/industry/implementation.png

@@ -5,6 +5,14 @@ PyPSA-USA is an open-source tool that enables you to model and simulate the Unit
 
 PyPSA-USA offers a versatile toolkit that allows you to customize the **data** for your energy system model with ease. Through a simple configuration file, you can control the spatial, temporal, and operational resolution of your model. Access a range of cleaned and prepared historical and forecasted data to build a model tailored to your needs.
 
+PyPSA-USA builds on and leverages the work of [PyPSA-EUR](https://pypsa-eur.readthedocs.io/en/latest/index.html) developed by TU Berlin. PyPSA-USA is actively developed by the [INES Research Group](https://ines.stanford.edu) at [Stanford University](https://www.stanford.edu/) and the [ΔE+ Research Group](https://www.sfu.ca/see/research/delta-e.html) at [Simon Fraser University](https://www.sfu.ca/).
+
+```{note}
+This model is under active development. If you need assistance or would like to discuss using the model, please reach out to **ktehranchi@stanford.edu** and **trevor_barnes@sfu.ca**
+```
+
+## Power Sector
+
 Whether you’re focusing on **ERCOT, WECC, or the Eastern Interconnection**, PyPSA-USA gives you the flexibility to:
 - Choose between multiple transmission networks.
 - Cluster the nodal network a user-defined number of nodes, respecting county lines, balancing areas, states, NERC region boundaries.
@@ -14,14 +22,22 @@ Whether you’re focusing on **ERCOT, WECC, or the Eastern Interconnection**, Py
 
 You can create and export data models for use in your own optimization models via CSV tables or xarray netCDF formats.
 
-PyPSA-USA also provides an interface for running capacity expansion planning and operational simulation models with the Python for Power System Analysis (pypsa) package. You can run expansion planning exercises which integrate regional and national policy constraints like RPS standards, emissions standards, PRMs, and more.
+PyPSA-USA also provides an interface for running capacity expansion planning and operational simulation models with the Python for Power System Analysis (pypsa) package. You can run expansion planning exercises which integrate regional and national policy constraints like RPS standards, emissions standards, ERMs, and more.
+
+## Sector Coupling
 
-PyPSA-USA builds on and leverages the work of [PyPSA-EUR](https://pypsa-eur.readthedocs.io/en/latest/index.html) developed by TU Berlin. It is actively developed by the [INES Research Group](https://ines.stanford.edu) at Stanford University and the [ΔE+ Research Group](https://www.sfu.ca/see/research/delta-e.html) at Simon Fraser University. We welcome contributions and collaborations from the community- please don't hesitate to reach out!
+Sector coupling studies build on the power sector to represent different aspects of the energy system. PyPSA-USA allows you to:
+- Model end-use technology options by sector (residential, commercial, transportation, industrial)
+- Include multiple end-use fuels (heating, cooling, ect.)
+- Study the natrual gas sector at a state level
+- Evaluate different electrification policies across different sectors
+
+Additionally, data from the NREL EFS, EIA Annual Energy Outlook, EIA consumption surveys, amoung other sources, are automatically pulled into PyPSA-USA limit/enforce production and capacity requirements accross different sectors.
 
 (workflow)=
 ## Workflow
 
-The diagram below illustrates the workflow of PyPSA-USA, highlighting how the data flows through the model scripts.
+The diagram below illustrates the power sector workflow of PyPSA-USA, highlighting how the data flows through the model scripts.
 
 ![pypsa-usa workflow](https://github.com/PyPSA/pypsa-usa/blob/master/workflow/repo_data/dag.jpg?raw=true)
 
@@ -62,8 +78,3 @@ PyPSA-USA is organized to facilitate easy navigation and efficient execution. Be
 |   │   └── example_data.csv
 |   └── Snakefile
 ```
-
-
-```{warning}
-**This model is under active development. If you need assistance or would like to discuss using the model, please reach out to ktehranchi@stanford.edu and trevor_barnes@sfu.ca.**
-```

docs/source/_static/pypsa-usa.drawio

@@ -31,7 +31,7 @@
     "sphinx.ext.mathjax",
     "sphinx.ext.napoleon",
     "sphinx.ext.graphviz",
-    # "sphinxcontrib.bibtex",
+    "sphinxcontrib.bibtex",
     # 'sphinx.ext.pngmath',
     # 'sphinxcontrib.tikz',
     # 'rinoh.frontend.sphinx',
@@ -43,6 +43,8 @@
 templates_path = ["_templates"]
 exclude_patterns = []
 
+bibtex_bibfiles = ["publications.bib"]
+bibtex_default_style = "unsrt"
 
 # -- Options for HTML output -------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output

docs/source/_static/service/pypsa-representation-simple.png

@@ -93,10 +93,6 @@ Specifies the types of generators that are included in the network, which are ex
    :file: configtables/electricity.csv
 ```
 
-```{note}
-See [here](./config-co2-base.md) for information on interconnect level base emission values.
-```
-
 (renewable_cf)=
 ## `renewable`
 
@@ -228,6 +224,7 @@ For a sector-based model:
    :header-rows: 1
    :widths: 22,7,22,33
    :file: configtables/dac.csv
+```
 
 (costs_cf)=
 ## `costs`