Merge branch 'master' into backport_staging_to_dev_10032021

gridsingularity · May 10, 2021 · 48e6e05 · 48e6e05
2 parents 52a75be + d6258a5
commit 48e6e05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.0
+current_version = 0.12.0
 commit = True
 tag = True
 
@@ -18,3 +18,4 @@ flake8 = on
 merge_marks = on
 pdb = on
 isort = off
+
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
     README = readme.read()
 
 # *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility.
-VERSION = '0.11.0'
+VERSION = '0.12.0'
 
 setup(
     name="d3a",