Merge plainbox:release into plainbox:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: b5f58231add9a1b86916a09679264437bae718ed
Merged at revision: d52873a97c132715c1bbd19eb8cef2bae8c7c796
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
Sylvain Pineau Approve
Review via email: mp+345160@code.launchpad.net

Commit message

Release_2018_Week19

Description of the change

Release_2018_Week19

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved

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 0838f31..18bd71f 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
1[bumpversion]1[bumpversion]
2current_version = 0.39.0.dev02current_version = 0.40.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 336f833..d1035a4 100644
--- a/plainbox/__init__.py
+++ b/plainbox/__init__.py
@@ -27,4 +27,4 @@ All abstract base classes are in :mod:`plainbox.abc`.
27# PEP440 compliant version declaration.27# PEP440 compliant version declaration.
28#28#
29# This is used by @public decorator to enforce our public API guarantees.29# This is used by @public decorator to enforce our public API guarantees.
30__version__ = '0.39.0.dev0'30__version__ = '0.40.0.dev0'
diff --git a/setup.py b/setup.py
index 94c515f..25966a5 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.39.0.dev0",42 version="0.40.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: