From 605edd22156ead0872a4a03381fcd5c9df465ab0 Mon Sep 17 00:00:00 2001
From: Elias Dorneles <eliasdorneles@gmail.com>
Date: Fri, 29 Jul 2016 13:43:32 -0300
Subject: [PATCH 1/2] better bumpversion config for branch 1.1 Having the
 part:prerel setup as it's right now, it's forcing releases to go through a
 pre-release cycle dev1, rc1, before the actual release.

This is not desired for older branches, since they will mostly get
only minor and patch releases.
---
 .bumpversion.cfg | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index b0be93474..19eb0e61d 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -12,13 +12,6 @@ serialize =
 
 [bumpversion:file:scrapy/VERSION]
 
-[bumpversion:part:prerel]
-optional_value = gamma
-values = 
-	dev
-	rc
-	gamma
-
 [bumpversion:part:prerelversion]
 values = 
 	1

From 73c8787b9ca0bafbb53e7a430add4ea5e74d132a Mon Sep 17 00:00:00 2001
From: Elias Dorneles <eliasdorneles@gmail.com>
Date: Mon, 1 Aug 2016 11:12:18 -0300
Subject: [PATCH 2/2] remove remaining prerelease configuration

---
 .bumpversion.cfg | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 19eb0e61d..2ba47f179 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -3,20 +3,5 @@ current_version = 1.1.1
 commit = True
 tag = True
 tag_name = {new_version}
-parse = ^
-	(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
-	(?:(?P<prerel>[abc]|rc|dev)(?P<prerelversion>\d+))?
-serialize = 
-	{major}.{minor}.{patch}{prerel}{prerelversion}
-	{major}.{minor}.{patch}
 
 [bumpversion:file:scrapy/VERSION]
-
-[bumpversion:part:prerelversion]
-values = 
-	1
-	2
-	3
-	4
-	5
-