Merge checkbox-support:release into checkbox-support:master

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Pierre Equoy
Approved revision: c4f3a9d79d409f74c3857f975001e208fb388174
Merged at revision: c4a5d80b30f8c1ce6b04bc74ed53d90dfe97ac5a
Proposed branch: checkbox-support:release
Merge into: checkbox-support:master
Diff against target: 109 lines (+30/-3)
7 files modified
.bumpversion.cfg (+1/-1)
checkbox_support.egg-info/PKG-INFO (+1/-1)
checkbox_support.egg-info/SOURCES.txt (+2/-0)
checkbox_support.egg-info/entry_points.txt (+3/-0)
dist/checkbox-support-0.30.0.tar.gz.asc (+11/-0)
dist/checkbox-support-0.30.0rc6.tar.gz.asc (+11/-0)
setup.py (+1/-1)
Reviewer Review Type Date Requested Status
Pierre Equoy Approve
Review via email: mp+313820@code.launchpad.net

Commit message

Release_2016_Week51

Description of the change

Release_2016_Week51

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

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.bumpversion.cfg b/.bumpversion.cfg
2index 87718c5..a9b699b 100644
3--- a/.bumpversion.cfg
4+++ b/.bumpversion.cfg
5@@ -1,5 +1,5 @@
6 [bumpversion]
7-current_version = 0.30.0.dev0
8+current_version = 0.31.0.dev0
9 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+))?((?P<release>\.?[a-z]+)(?P<N>\d+))?
10 serialize =
11 {major}.{minor}.{patch}{release}{N}
12diff --git a/checkbox_support.egg-info/PKG-INFO b/checkbox_support.egg-info/PKG-INFO
13index fe8ea94..9f7d812 100644
14--- a/checkbox_support.egg-info/PKG-INFO
15+++ b/checkbox_support.egg-info/PKG-INFO
16@@ -1,6 +1,6 @@
17 Metadata-Version: 1.0
18 Name: checkbox-support
19-Version: 0.29.0
20+Version: 0.30.0
21 Summary: CheckBox support library
22 Home-page: https://launchpad.net/checkbox/
23 Author: Sylvain Pineau
24diff --git a/checkbox_support.egg-info/SOURCES.txt b/checkbox_support.egg-info/SOURCES.txt
25index 1e10e21..e21ccdd 100644
26--- a/checkbox_support.egg-info/SOURCES.txt
27+++ b/checkbox_support.egg-info/SOURCES.txt
28@@ -4,6 +4,7 @@ README.rst
29 setup.cfg
30 setup.py
31 checkbox_support/__init__.py
32+checkbox_support/log_watcher.py
33 checkbox_support/udev.py
34 checkbox_support.egg-info/PKG-INFO
35 checkbox_support.egg-info/SOURCES.txt
36@@ -147,6 +148,7 @@ checkbox_support/parsers/tests/udevadm_data/XEON.txt
37 checkbox_support/scripts/__init__.py
38 checkbox_support/scripts/audio_settings.py
39 checkbox_support/scripts/gputest_benchmark.py
40+checkbox_support/scripts/run_watcher.py
41 checkbox_support/scripts/tests/__init__.py
42 checkbox_support/scripts/tests/test_audio_settings.py
43 checkbox_support/scripts/tests/test_gputest_benchmark.py
44diff --git a/checkbox_support.egg-info/entry_points.txt b/checkbox_support.egg-info/entry_points.txt
45index 20c469e..c2f1a47 100644
46--- a/checkbox_support.egg-info/entry_points.txt
47+++ b/checkbox_support.egg-info/entry_points.txt
48@@ -1,3 +1,6 @@
49+[console_scripts]
50+checkbox-support-run_watcher = checkbox_support.scripts.run_watcher:main
51+
52 [plainbox.parsers]
53 bto = checkbox_support.parsers.image_info:parse_bto_attachment_output
54 buildstamp = checkbox_support.parsers.image_info:parse_buildstamp_attachment_output
55diff --git a/dist/checkbox-support-0.30.0.tar.gz b/dist/checkbox-support-0.30.0.tar.gz
56new file mode 100644
57index 0000000..8ec3e67
58Binary files /dev/null and b/dist/checkbox-support-0.30.0.tar.gz differ
59diff --git a/dist/checkbox-support-0.30.0.tar.gz.asc b/dist/checkbox-support-0.30.0.tar.gz.asc
60new file mode 100644
61index 0000000..7777906
62--- /dev/null
63+++ b/dist/checkbox-support-0.30.0.tar.gz.asc
64@@ -0,0 +1,11 @@
65+-----BEGIN PGP SIGNATURE-----
66+Version: GnuPG v1
67+
68+iQEcBAABAgAGBQJYXOM5AAoJELSxaWXskx+ToFkH+wS0+ZvqW6E+8eTo06bNZ624
69+BFrYocl4itOsUWnNFBF7gSrNcFOQPCrhxnwlVXg4N1y9jLDQY7SAm3jZ0CGwe+nF
70+9ltii4jR7Z0ODBOHn8FPu1s95pQxJHtG89BfVS2P2Du4sRljIOWXi27TN/zfhc/j
71+tncuM2oF09SUAvT7TFOU0bMq8js1AFVtuAvRc8WhJAxtfu99q1awr+HSvNTwV+az
72+bguMSK2vEIQ+02Xgy7A8srF5rl1D/FwAUgCaQ8RezWgPRF4Tsr54NWnqxDhHEher
73+kyQDOuq652pbxEX06k7eMJsRZaetYrMyIg+duT48OMPYu3O8sN49jC5PuvkU2jY=
74+=CyKL
75+-----END PGP SIGNATURE-----
76diff --git a/dist/checkbox-support-0.30.0rc6.tar.gz b/dist/checkbox-support-0.30.0rc6.tar.gz
77new file mode 100644
78index 0000000..aebe872
79Binary files /dev/null and b/dist/checkbox-support-0.30.0rc6.tar.gz differ
80diff --git a/dist/checkbox-support-0.30.0rc6.tar.gz.asc b/dist/checkbox-support-0.30.0rc6.tar.gz.asc
81new file mode 100644
82index 0000000..5470ef9
83--- /dev/null
84+++ b/dist/checkbox-support-0.30.0rc6.tar.gz.asc
85@@ -0,0 +1,11 @@
86+-----BEGIN PGP SIGNATURE-----
87+Version: GnuPG v1
88+
89+iQEcBAABAgAGBQJYWlJJAAoJELSxaWXskx+TYIgIAMk+ct18zhh2/UVbM+z2n4hb
90+mmG2pAMqFHRNp/M9jSC+dIHZR6mCoNuhTByWKNu7f2zt7JaajJjDOzCNkXoXzRQZ
91+yDMOawPzuXNzQ+5rtJd4WMIFZymWqzzUbVBaVcWrBefQKlEicA57NnH15ofEB3EG
92+8TDw4xey0txPfgIFi3APea9EOUUQkEDzqh+JtVyhtlRDPfdJhI6POvn/rsVHLSF/
93+em/3Yzzeaf4zLLXjdthR4cNsxZhmC5kF4wvpfNoBs9rCMEqdSjZy4bK4A0fhGMPj
94+qFvlP13UWfQhOR2HRBmZLYfI9zn8PYvs95vGQy0n//4M8t1R3qOmx1kXQ0+S13A=
95+=PJ1/
96+-----END PGP SIGNATURE-----
97diff --git a/setup.py b/setup.py
98index 00f655e..2cafd75 100755
99--- a/setup.py
100+++ b/setup.py
101@@ -38,7 +38,7 @@ with open(os.path.join(base_dir, "README.rst"), encoding="UTF-8") as stream:
102
103 setup(
104 name="checkbox-support",
105- version="0.30.0.dev0",
106+ version="0.31.0.dev0",
107 url="https://launchpad.net/checkbox/",
108 packages=find_packages(),
109 test_suite='checkbox_support.tests.test_suite',

Subscribers

People subscribed via source and target branches

to all changes: