Merge lp:~pedronis/uservice-logging/rel-0.10.1 into lp:uservice-logging

Proposed by Samuele Pedroni on 2015-08-21
Status: Merged
Approved by: Samuele Pedroni on 2015-08-21
Approved revision: 22
Merged at revision: 22
Proposed branch: lp:~pedronis/uservice-logging/rel-0.10.1
Merge into: lp:uservice-logging
Diff against target: 58 lines (+15/-9)
3 files modified
CHANGELOG (+7/-1)
release_HOWTO.rst (+7/-7)
uservice_logging/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~pedronis/uservice-logging/rel-0.10.1
Reviewer Review Type Date Requested Status
Facundo Batista (community) 2015-08-21 Approve on 2015-08-21
Review via email: mp+268750@code.launchpad.net

Commit message

release 0.10.1, update CHANGELOG, improve release_HOWTO.rst
Add a review or comment

Description of the change

release 0.10.1, update CHANGELOG, improve release_HOWTO.rst

To post a comment you must log in.
Facundo Batista (facundo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CHANGELOG'
2--- CHANGELOG 2015-08-03 15:15:05 +0000
3+++ CHANGELOG 2015-08-21 13:37:06 +0000
4@@ -1,8 +1,14 @@
5 Release History:
6 ################
7
8+0.10.1
9+======
10+
11+* monkeypatch the use of a safe JSONEncoder for formatting messages
12+ for logstash so not to lose logs by crashing
13+
14 0.10.0
15-=====
16+======
17
18 * replace set_extra_args with thread-safe add_extra_args, with extra
19 args per thread and additive over the thread lifetime, support a
20
21=== modified file 'release_HOWTO.rst'
22--- release_HOWTO.rst 2015-07-31 14:52:16 +0000
23+++ release_HOWTO.rst 2015-08-21 13:37:06 +0000
24@@ -1,15 +1,15 @@
25 How To Release
26 ##############
27
28-.. xxx merge with README?
29-
30 1. Change the `__version__` tuple in `uservice_logging/__init__.py` so the 4th element is 'final', rather than 'dev'.
31 2. Change the 'NEXT' CHANGELOG entry to reflect the 3-number version you're about to release (like 1.0.2)
32-3. `pip install wheel twine`
33-4. Build a wheel: python setup.py bdist_wheel
34-5. Upload to pypi (currently you need to be Thomi or Joe to do this): twine upload dist/*
35-6. Open the new development series:
36+3. Commit
37+4. bzr tag the release (like bzr tag 1.0.2)
38+5. `pip install wheel twine`
39+6. Build a wheel: python setup.py bdist_wheel
40+7. Upload to pypi (you need one of the project owners there): twine upload dist/*
41+8. Open the new development series:
42 a. Increment the minor release version in `uservice_logging/__init__`
43 b. Set the release phase to 'dev'
44 c. Create a new entry in CHANGELOG called 'NEXT'
45-7. Commit; create MP; merge to trunk;
46+9. Commit; create MP; merge to trunk;
47
48=== modified file 'uservice_logging/__init__.py'
49--- uservice_logging/__init__.py 2015-08-03 15:33:04 +0000
50+++ uservice_logging/__init__.py 2015-08-21 13:37:06 +0000
51@@ -29,6 +29,6 @@
52 # If the releaselevel is 'final', then the tarball will be major.minor.micro.
53 # Otherwise it is major.minor.micro~$(revno).
54
55-__version__ = (0, 10, 0, 'final')
56+__version__ = (0, 10, 1, 'final')
57
58 from .logging import configure_logging # noqa

Subscribers

People subscribed via source and target branches

to all changes: