From 98c1f0d3544f549a8a59df8316248d11375bbe0a Mon Sep 17 00:00:00 2001
From: Thomas Gilon <thomas.gilon@openenergytransition.org>
Date: Fri, 25 Oct 2024 18:03:57 +0200
Subject: [PATCH] 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
---
 .gitignore                          | 2 ++
 .vscode/settings.json               | 3 ---
 config.yaml                         | 2 +-
 docs/release_notes.rst              | 2 ++
 docs/structure.rst                  | 2 +-
 environment.yaml                    | 1 +
 scripts/_helpers.py                 | 2 +-
 scripts/compile_cost_assumptions.py | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index 836167c2..d103c00c 100644
--- 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
deleted file mode 100644
index a7d0fc7b..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "esbonio.sphinx.confDir": ""
-}
\ No newline at end of file
diff --git a/config.yaml b/config.yaml
index d6fdf0b9..a73f541f 100644
--- 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
index 05129a66..2f76faa6 100644
--- 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
index 88df4d22..f3606665 100644
--- 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
index 99d693fb..ae4dede7 100644
--- 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
index 95edb2ba..9279ce4e 100644
--- 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
index aa203b42..cb418af2 100644
--- 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)
     """