Merge plainbox:release into plainbox:master

Proposed by Pierre Equoy
Status: Merged
Approved by: Pierre Equoy
Approved revision: 0e85d81b6cc686baba8518ade9f2ef5a651d5caf
Merged at revision: de70b69fd24c6e9fd0f7f83b57a071c88df491fd
Proposed branch: plainbox:release
Merge into: plainbox:master
Diff against target: 34 lines (+3/-3)
3 files modified
.bumpversion.cfg (+1/-1)
plainbox/__init__.py (+1/-1)
setup.py (+1/-1)
Reviewer Review Type Date Requested Status
Pierre Equoy Approve
Review via email: mp+319659@code.launchpad.net

Commit message

Release_2017_Week11

Description of the change

Release_2017_Week11

To post a comment you must log in.
Revision history for this message
Pierre Equoy (pieq) wrote :

Self-approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 5b1ff90..9b5f515 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
1[bumpversion]1[bumpversion]
2current_version = 0.34.0.dev02current_version = 0.35.0.dev0
3parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))?((?P<release>\.?[a-z]+)(?P<N>\d+))?3parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))?((?P<release>\.?[a-z]+)(?P<N>\d+))?
4serialize = 4serialize =
5 {major}.{minor}.{patch}{release}{N}5 {major}.{minor}.{patch}{release}{N}
diff --git a/plainbox/__init__.py b/plainbox/__init__.py
index ebeda42..3bd9414 100644
--- a/plainbox/__init__.py
+++ b/plainbox/__init__.py
@@ -33,4 +33,4 @@ if sys.version_info[0:2] < (3, 2):
33# PEP440 compliant version declaration.33# PEP440 compliant version declaration.
34#34#
35# This is used by @public decorator to enforce our public API guarantees.35# This is used by @public decorator to enforce our public API guarantees.
36__version__ = '0.34.0.dev0'36__version__ = '0.35.0.dev0'
diff --git a/setup.py b/setup.py
index 758aaf7..a2d5b7b 100755
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
3939
40setup(40setup(
41 name="plainbox",41 name="plainbox",
42 version="0.34.0.dev0",42 version="0.35.0.dev0",
43 url="https://launchpad.net/plainbox/",43 url="https://launchpad.net/plainbox/",
44 packages=find_packages(),44 packages=find_packages(),
45 author="Zygmunt Krynicki",45 author="Zygmunt Krynicki",

Subscribers

People subscribed via source and target branches

to all changes: