Prep for 1.2.0 release (#300)

* Prep for 1.2.0 release * Regenerate hydrograph baseline image using fresh env * Fix readthedocs build * Compliant requirements file * Only mention latest version in CITATION.cff
eWaterCycle · Mar 28, 2022 · f0e45c7 · f0e45c7
1 parent f04004d
commit f0e45c7
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.4
+current_version = 1.2.0
 
 [bumpversion:file:src/ewatercycle/version.py]
 search = __version__ = "{current_version}"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ Formatted as described on [https://keepachangelog.com](https://keepachangelog.co
 
 ## [Unreleased]
 
+## [1.2.0] (2022-03-28)
+
+### Added
+
+- Evaporation Pre-Processor for the LISFLOOD (Lisvap) to forcing ([#282](https://github.com/eWaterCycle/ewatercycle/issues/282))
+- Set number of bars in hydrograph ([#298](https://github.com/eWaterCycle/ewatercycle/pull/298))
+
 ## [1.1.4] (2022-01-14)
 
 ### Added
@@ -125,7 +132,8 @@ Formatted as described on [https://keepachangelog.com](https://keepachangelog.co
 - Empty Python project directory structure
 - Added symlink based data files copier
 
-[Unreleased]: https://github.com/eWaterCycle/ewatercycle/compare/1.1.4...HEAD
+[Unreleased]: https://github.com/eWaterCycle/ewatercycle/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/eWaterCycle/ewatercycle/compare/1.1.4...1.2.0
 [1.1.4]: https://github.com/eWaterCycle/ewatercycle/compare/1.1.3...1.1.4
 [1.1.3]: https://github.com/eWaterCycle/ewatercycle/compare/1.1.2...1.1.3
 [1.1.2]: https://github.com/eWaterCycle/ewatercycle/compare/1.1.1...1.1.2

diff --git a/CITATION.cff b/CITATION.cff
@@ -68,7 +68,4 @@ identifiers:
   - description: Latest version of software
     type: doi
     value: "10.5281/zenodo.5119389"
-  - description: Version 1.1.0
-    type: doi
-    value: "10.5281/zenodo.5175508"
 ...
diff --git a/docs/conf.py b/docs/conf.py
@@ -59,7 +59,7 @@
 #
 # The short X.Y version.
 # The full version, including alpha/beta/rc tags.
-version = "1.1.4"
+version = "1.2.0"
 release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -2,3 +2,5 @@ ipython
 nbsphinx
 ruamel.yaml
 sphinx-copybutton
+# TODO workaround till https://github.com/jupyter/nbconvert/issues/1736 is fixed
+jinja2<3.1.0
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = ewatercycle
-version = 1.1.4
+version = 1.2.0
 description = A Python package for running and validating a hydrology model
 long_description = file: README.md
 long_description_content_type = text/markdown

diff --git a/src/ewatercycle/version.py b/src/ewatercycle/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "1.1.4"
+__version__ = "1.2.0"
diff --git a/tests/baseline_images/test_analysis/hydrograph.png b/tests/baseline_images/test_analysis/hydrograph.png
diff --git a/tests/test_analysis.py b/tests/test_analysis.py
@@ -7,7 +7,6 @@
 
 @image_comparison(
     baseline_images=["hydrograph"],
-    remove_text=True,
     extensions=["png"],
     savefig_kwarg={"bbox_inches": "tight"},
 )