Merge branch 'release/0.0.2' into dev

rl-institut · Sep 19, 2023 · 8d9fe84 · 8d9fe84
2 parents 6c0878e + 4b13d0d
commit 8d9fe84
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 4 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -23,7 +23,7 @@
 author = "Reiner Lemoine Institut"
 
 # The full version, including alpha/beta/rc tags
-release = "0.0.2dev0"
+release = "0.0.3dev0"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt
@@ -1,2 +1,5 @@
 setuptools
--e .
+-e .
+sphinx
+sphinx_rtd_theme
+sphinx-copybutton
diff --git a/docs/whats_new.rst b/docs/whats_new.rst
@@ -10,3 +10,4 @@ What's new
     :backlinks: top
 
 .. include::  whats_new/v0-0-1.rst
+.. include::  whats_new/v0-0-2.rst
diff --git a/docs/whats_new/v0-0-1.rst b/docs/whats_new/v0-0-1.rst
@@ -1,2 +1,4 @@
 v0.0.1
 ======
+
+* First release of oemoflex
diff --git a/docs/whats_new/v0-0-2.rst b/docs/whats_new/v0-0-2.rst
@@ -0,0 +1,5 @@
+v0.0.2
+======
+
+* The oemof-tabular version has been increased to v0.0.4.dev1 which leads to an update of the
+  oemof.solph version to dev version which currently stands at version 0.5.1
diff --git a/examples/plotting_data.py b/examples/plotting_data.py
@@ -8,7 +8,13 @@
 input_path = os.path.join(
     here, "03_postprocessed", "simple_model", "sequences", "bus", "A-electricity.csv"
 )
-data = pd.read_csv(input_path, header=[0, 1, 2], parse_dates=[0], index_col=[0])
+
+try:
+    data = pd.read_csv(input_path, header=[0, 1, 2], parse_dates=[0], index_col=[0])
+except FileNotFoundError:
+    raise FileNotFoundError(
+        f"Missing file: {input_path}.\nPlease run 'simple_model' first."
+    )
 
 # create directory for plots
 path_plotted = os.path.join(here, "04_plotted")

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@ def read(fname):
 
 setup(
     name="oemoflex",
-    version="0.0.2dev0",
+    version="0.0.3dev0",
     description="A flexible model structure for creating and analysing multi-regional"
     "sector-integrated energysystem models featuring many flexibility options",
     long_description=read("README.md"),