Merge pull request #11 from brey/master

[release] Bump version: 0.5.1 → 0.5.2
ec-jrc · Apr 27, 2021 · d6a0fca · d6a0fca
2 parents 8f279a5 + e7b65ee
commit d6a0fca
Show file tree

Hide file tree

Showing 8 changed files with 2,976 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.1
+current_version = 0.5.2
 commit = True
 message = [release] Bump version: {current_version} → {new_version}
 tag = False

diff --git a/HOW_TO_RELEASE.md b/HOW_TO_RELEASE.md
@@ -30,6 +30,9 @@
 
 `poetry build`
 
+- rebase to upstream (if needed)
+
+`git rebase -i upstream/master`
 
 - test CI on github
 

diff --git a/binder/environment.yml b/binder/environment.yml
@@ -6,7 +6,7 @@ channels:
 
 dependencies:
   - python=3.8
-  - pyposeidon=0.5.1
+  - pyposeidon=0.5.2
   - pschism
   - delft3d4
   - xorg-libxcursor

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "pyposeidon" %}
-{% set version = "0.5.1" %}
+{% set version = "0.5.2" %}
 {% set build = 0 %}
 
 package: