From f437747f2d6d20024465004b1d1d6dadf13439d5 Mon Sep 17 00:00:00 2001 From: Ashley Camba Garrido Date: Mon, 23 Oct 2017 21:18:09 +0200 Subject: [PATCH 1/4] Add bumpversion config --- .bumpversion.cfg | 24 ++++++++++++++++++++++++ raven/__init__.py | 2 +- tox.ini | 16 ++++++++++------ 3 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 .bumpversion.cfg diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 000000000..ca59e2616 --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,24 @@ +[bumpversion] +commit = False +tag = False +tag_name = {new_version} +current_version = 6.3.0-dev +parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+))? +serialize = + {major}.{minor}.{patch}-{release} + {major}.{minor}.{patch} +message = Release: {current_version} → {new_version} + +[bumpversion:file:raven/__init__.py] + +[bumpversion:part:release] +optional_value = production +values = + dev + production + +[bumpversion:file:CHANGELOG.md] + search = + {current_version} (Unreleased) + replace = + {new_version} ({now:%Y-%m-%d}) diff --git a/raven/__init__.py b/raven/__init__.py index b2e533f40..923b5a9e9 100644 --- a/raven/__init__.py +++ b/raven/__init__.py @@ -12,7 +12,7 @@ __all__ = ('VERSION', 'Client', 'get_version') -VERSION = '6.3.0.dev0' +VERSION = '6.3.0-dev' def _get_git_revision(path): diff --git a/tox.ini b/tox.ini index ddb68ff46..173cf4edc 100644 --- a/tox.ini +++ b/tox.ini @@ -137,14 +137,18 @@ deps = commands = python setup.py -q sdist bdist_wheel -[testenv:release] +[testenv:bump] basepython = python3.5 skip_install = true deps = - {[testenv:build]deps} - twine >= 1.9.1 + bumpversion commands = - {[testenv:build]commands} - twine upload --skip-existing dist/* - + bumpversion --tag --commit {posargs} release +[testenv:next] +basepython = python3.5 +skip_install = true +deps = + bumpversion +commands = + bumpversion {posargs} minor From d98a7e03576df40389b1c6f9e80cbd8024c43232 Mon Sep 17 00:00:00 2001 From: Ashley Camba Garrido Date: Thu, 26 Oct 2017 06:56:45 +0200 Subject: [PATCH 2/4] Revert dev version to dev0 and adapt bumpversion --- .bumpversion.cfg | 14 ++++---------- raven/__init__.py | 3 +-- tox.ini | 14 +++++++++++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ca59e2616..58747dc58 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -2,11 +2,11 @@ commit = False tag = False tag_name = {new_version} -current_version = 6.3.0-dev -parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+))? +current_version = 6.3.0 +parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? serialize = - {major}.{minor}.{patch}-{release} - {major}.{minor}.{patch} + {major}.{minor}.{patch}.{release}{dev} + {major}.{minor}.{patch} message = Release: {current_version} → {new_version} [bumpversion:file:raven/__init__.py] @@ -16,9 +16,3 @@ optional_value = production values = dev production - -[bumpversion:file:CHANGELOG.md] - search = - {current_version} (Unreleased) - replace = - {new_version} ({now:%Y-%m-%d}) diff --git a/raven/__init__.py b/raven/__init__.py index 923b5a9e9..d8cfaae13 100644 --- a/raven/__init__.py +++ b/raven/__init__.py @@ -12,8 +12,7 @@ __all__ = ('VERSION', 'Client', 'get_version') -VERSION = '6.3.0-dev' - +VERSION = '6.3.0.dev0' def _get_git_revision(path): revision_file = os.path.join(path, 'refs', 'heads', 'master') diff --git a/tox.ini b/tox.ini index 173cf4edc..9604fb075 100644 --- a/tox.ini +++ b/tox.ini @@ -137,7 +137,7 @@ deps = commands = python setup.py -q sdist bdist_wheel -[testenv:bump] +[testenv:release] basepython = python3.5 skip_install = true deps = @@ -145,10 +145,18 @@ deps = commands = bumpversion --tag --commit {posargs} release -[testenv:next] +[testenv:minor] basepython = python3.5 skip_install = true deps = bumpversion commands = - bumpversion {posargs} minor + bumpversion --tag --commit {posargs} minor + +[testenv:dev] +basepython = python3.5 +skip_install = true +deps = + bumpversion +commands = + bumpversion {posargs} --commit {posargs} patch From bc5b786c4e313bac161c1952a61dd7c3d367b3d6 Mon Sep 17 00:00:00 2001 From: Ashley Camba Garrido Date: Thu, 26 Oct 2017 10:12:32 +0200 Subject: [PATCH 3/4] Pin flake8 version --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 234393329..ff34b2174 100755 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ 'bottle', 'celery>=2.5', 'exam>=0.5.2', - 'flake8==3.4.1', + 'flake8==3.5.0', 'logbook', 'mock', 'nose', @@ -73,7 +73,7 @@ 'pytest-sugar==0.8', 'pytest-assume', 'pytest-cov', - 'pytest-flake8', + 'pytest-flake8==0.9', 'requests', 'tornado>=4.1', 'webob', From ec3066601e8ca683ffd8649b94ad2686e7195dec Mon Sep 17 00:00:00 2001 From: Ashley Camba Garrido Date: Thu, 26 Oct 2017 10:27:30 +0200 Subject: [PATCH 4/4] Fix flake8 violation --- raven/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/raven/__init__.py b/raven/__init__.py index d8cfaae13..b2e533f40 100644 --- a/raven/__init__.py +++ b/raven/__init__.py @@ -14,6 +14,7 @@ VERSION = '6.3.0.dev0' + def _get_git_revision(path): revision_file = os.path.join(path, 'refs', 'heads', 'master') if not os.path.exists(revision_file):