Merge branch 'main' of github.com:eWaterCycle/ewatercycle

eWaterCycle · Aug 10, 2021 · 6ed368b · 6ed368b
2 parents 4a36de7 + cbb9426
commit 6ed368b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.0
+current_version = 1.1.0
 
 [bumpversion:file:ewatercycle/version.py]
 search = __version__ = '{current_version}'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ Formatted as described on [https://keepachangelog.com](https://keepachangelog.co
 
 ## [Unreleased]
 
+## [1.1.0] (2021-08-10)
+
 ### Added
 
 - Column name argument to `get_grdc_data()` ([#190](https://github.com/eWaterCycle/ewatercycle/issues/190))
@@ -20,6 +22,7 @@ Formatted as described on [https://keepachangelog.com](https://keepachangelog.co
 
 - ParameterSet can be outside CFG['parametersets_dir'] ([#217](https://github.com/eWaterCycle/ewatercycle/issues/217))
 - Link to nbviewer ([#202](https://github.com/eWaterCycle/ewatercycle/issues/202))
+- Pinned esmpy as temporary workaround for single CPU affinity ([#234](https://github.com/eWaterCycle/ewatercycle/issues/234))
 
 ### Removed
 
@@ -73,6 +76,7 @@ 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.0.0...HEAD
+[Unreleased]: https://github.com/eWaterCycle/ewatercycle/compare/1.1.0...HEAD
+[1.1.0]: https://github.com/eWaterCycle/ewatercycle/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/eWaterCycle/ewatercycle/compare/0.2.x-observation_data...1.0.0
 [0.2.0]: https://github.com/eWaterCycle/ewatercycle/releases/tag/0.2.x-observation_data
diff --git a/docs/conf.py b/docs/conf.py
@@ -63,7 +63,7 @@
 #
 # The short X.Y version.
 # The full version, including alpha/beta/rc tags.
-version = '1.0.0'
+version = '1.1.0'
 release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation

diff --git a/environment.yml b/environment.yml
@@ -8,3 +8,6 @@ dependencies:
   - python>=3.7
   - esmvaltool-python>=2.3.0
   - subversion
+  # Pin esmpy so we dont get forced to run all parallel tasks on single cpu
+  # Can be removed once https://github.com/ESMValGroup/ESMValCore/issues/1208 is resolved.
+  - esmpy!=8.1.0
diff --git a/ewatercycle/version.py b/ewatercycle/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '1.0.0'
+__version__ = '1.1.0'
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = ewatercycle
-version = 1.0.0
+version = 1.1.0
 description = A Python package for running and validating a hydrology model
 author = Stefan Verhoeven
 author_email = [email protected]