Merge pull request #355 from rl-institut/release/v0.0.4

Release/v0.0.4
rl-institut · Mar 11, 2024 · ad59a82 · ad59a82
2 parents 79565d8 + 7ac239f
commit ad59a82
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ It is recommended to install poetry system-wide via the command below or
        cd oemof-B3
 3. Create virtual environment using conda:
 
-       conda env create environment.yml
+       conda env create -f environment.yml
 4. Activate environment:
 
        conda activate oemof-B3

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.4dev'
+release = '0.0.5dev'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt
@@ -1,4 +1,4 @@
 # Duplicates the docs requirements in pyproject.toml, but is necessary for readthedocs (rtd does not allow to poetry install -E docs).
-sphinx
+sphinx>=5.0.0
 sphinx-rtd-theme>=0.5.1
 sphinxcontrib_bibtex
diff --git a/docs/getting_started.rst b/docs/getting_started.rst
@@ -41,7 +41,7 @@ It is recommended to install poetry system-wide via the command below or
 
 ::
 
-    conda env create environment.yml
+    conda env create -f environment.yml
 
 4. Activate environment:
 

diff --git a/docs/whats_new.rst b/docs/whats_new.rst
@@ -4,6 +4,7 @@
 What's new
 ~~~~~~~~~~
 
+.. include:: whats_new/v0-0-4.rst
 .. include:: whats_new/v0-0-3.rst
 .. include:: whats_new/v0-0-2.rst
 .. include:: whats_new/v0-0-1.rst
diff --git a/docs/whats_new/v0-0-4.rst b/docs/whats_new/v0-0-4.rst
@@ -2,13 +2,22 @@ v0.0.4
 ======
 
 # New features
+* oemof-B3 now runs with latest release of oemoflex -> v0.0.3
+* Hence it runs with oemof.tabular -> version v0.0.5
 
 # Bug fixes
-
-# Documentation
-
-# Tests
-
-# Other changes
+* Wrong zenodo link to raw data has been fixed
+* documentation build has been fixed (commit 07084684e8897ac34327a41bae990a3d881226d8)
 
 # Contributors
+- jnnr
+- MaGering
+- SabineHaas
+- juliusmeier
+- henhuy
+- monika-o
+- c-moeller
+- Stefanie08
+- chrwm
+- khelfen
+- mjazimm
diff --git a/docs/whats_new/v0-0-5.rst b/docs/whats_new/v0-0-5.rst
@@ -0,0 +1,23 @@
+v0.0.4
+======
+
+# New features
+
+# Bug fixes
+
+# Documentation
+
+# Tests
+
+# Contributors
+- jnnr
+- MaGering
+- SabineHaas
+- juliusmeier
+- henhuy
+- monika-o
+- c-moeller
+- Stefanie08
+- chrwm
+- khelfen
+- mjazimm
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oemof-B3"
-version = "0.0.4dev"
+version = "0.0.5dev"
 description = "oemof-B3 - an open-source energy system model for Brandenburg/Berlin"
 authors = [
   "Jann Launer <[email protected]>",
@@ -26,7 +26,7 @@ pyyaml = ">=6.0"
 dynaconf = "^3.1.7"
 snakemake = ">=5"
 oemoflex = {git = "https://github.com/rl-institut/oemoflex.git", rev = "0.0.3"}
-Sphinx = {version = "^4.3.2", optional = true}
+Sphinx = {version = ">=5.0", optional = true}
 sphinx-rtd-theme = {version = "^1.0.0", optional = true}
 sphinxcontrib-bibtex = {version = "^2.4.1", optional = true}
 docutils = "^0.17"