bumpversion to 0.12.0.dev0

glemaitre · glemaitre · commit 124d10893636 · 2023-07-08T23:57:09.000+02:00
diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -4,6 +4,8 @@
 Release history
 ===============
 
+.. include:: whats_new/v0.12.rst
+
 .. include:: whats_new/v0.11.rst
 
 .. include:: whats_new/v0.10.rst
diff --git a/doc/whats_new/v0.11.rst b/doc/whats_new/v0.11.rst
@@ -67,10 +67,7 @@ Enhancements
 - :class:`~imblearn.over_sampling.SMOTENC` now support passing array-like of `str`
   when passing the `categorical_features` parameter.
   :pr:`1008` by :user`Guillaume Lemaitre <glemaitre>`.
-<<<<<<< HEAD
 
 - :class:`~imblearn.over_sampling.SMOTENC` now support automatic categorical inference
   when `categorical_features` is set to `"auto"`.
   :pr:`1009` by :user`Guillaume Lemaitre <glemaitre>`.
-=======
->>>>>>> origin/master
diff --git a/doc/whats_new/v0.12.rst b/doc/whats_new/v0.12.rst
@@ -0,0 +1,8 @@
+.. _changes_0_12:
+
+Version 0.12.0 (Under development)
+==================================
+
+
+Changelog
+---------
diff --git a/imblearn/_version.py b/imblearn/_version.py
@@ -22,4 +22,4 @@
 # 'X.Y.dev0' is the canonical version of 'X.Y.dev'
 #
 
-__version__ = "0.11.0"
+__version__ = "0.12.0.dev0"
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.11.0
+current_version = 0.12.0.dev0
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
 serialize =

Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@`
`22`	`22`	`# 'X.Y.dev0' is the canonical version of 'X.Y.dev'`
`23`	`23`	`#`
`24`	`24`
`25`		`-__version__ = "0.11.0"`
	`25`	`+__version__ = "0.12.0.dev0"`