Update minor issues (#150)

* Update .gitignore * Fix typo in documentation * Fix typo in config.yaml * Fix typo in compile_cost_assumptions.py * Add pypsa as requested by _helpers.py * Fix import in _helpers.py * Add release note
PyPSA · Oct 25, 2024 · 98c1f0d · 98c1f0d
1 parent b464821
commit 98c1f0d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 
 .snakemake
 _build
+.idea
+.vscode
 gurobi.log
 *.log
 */__pycache__

diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/config.yaml b/config.yaml
@@ -20,7 +20,7 @@ energy_storage_database:
         approx_beyond_2030: ["same_as_2030"]  # ["geometric_series"] or ["same_as_2030"]
 
 # remove grid connection costs from DEA for offwind because they are calculated
-# seperately in pypsa-eur
+# separately in pypsa-eur
 offwind_no_gridcosts : true
 
 desalination:

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -9,6 +9,8 @@ Release Notes
 
 * added geothermal district heating as `central geothermal-sourced heat pump` based on DEA technology catalogue ("45.1.a Geothermal DH, 1200m, E")
 
+* Fix minor issues in the code
+
 
 Technology-Data 0.9.2 (30 August 2024)
 ======================================

diff --git a/docs/structure.rst b/docs/structure.rst
@@ -17,7 +17,7 @@ This repository has the following structure:
 	* source (e.g. DEA, excel_file_name.xlsx)
 	* further description (specific assumptions, sheet name if data from a multi-sheet Excel file)
 
--  **conifg**: 
+-  **config**:
 
 	.. literalinclude:: ../config.yaml
 	   :language: yaml

diff --git a/environment.yaml b/environment.yaml
@@ -8,6 +8,7 @@ dependencies:
   # for running the package
   - snakemake-minimal>=8.5
   - pandas>=2.1
+  - pypsa
   - numpy
   - beautifulsoup4
   - xlrd

diff --git a/scripts/_helpers.py b/scripts/_helpers.py
@@ -91,7 +91,7 @@ def mock_snakemake(
     from snakemake.api import Workflow
     from snakemake.common import SNAKEFILE_CHOICES
     from snakemake.script import Snakemake
-    from snakemake.settings import (
+    from snakemake.settings.types import (
         ConfigSettings,
         DAGSettings,
         ResourceSettings,

diff --git a/scripts/compile_cost_assumptions.py b/scripts/compile_cost_assumptions.py
@@ -777,7 +777,7 @@ def add_co2_intensity(costs):
 
 def add_solar_from_other(costs):
     """"
-    add solar from other sources than DEA (since the life time assumed in
+    add solar from other sources than DEA (since the lifetime assumed in
     DEA is very optimistic)
     """
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     .snakemake
     _build
+    .idea
+    .vscode
     gurobi.log
     *.log
     */__pycache__
@@ Expand Down @@