Merge ~sylvain-pineau/checkbox-support:unixsocket_python35 into checkbox-support:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: fd27f48c8005cf9279e461cd4f6b26b89c314cc1
Merged at revision: 68d34651e3b3201d3caa2a77da2c75c96b6cc671
Proposed branch: ~sylvain-pineau/checkbox-support:unixsocket_python35
Merge into: checkbox-support:master
Diff against target: 16 lines (+3/-2)
1 file modified
setup.py (+3/-2)
Reviewer Review Type Date Requested Status
Maciej Kisielewski Approve
Review via email: mp+332768@code.launchpad.net

Description of the change

Use sys.version_info >= (3,5) to only depends on unixsocket on recent releases (all but Trusty).

To fix daily builds: https://code.launchpad.net/~checkbox-dev/+recipe/checkbox-support-daily

To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

/me crosses fingers

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/setup.py b/setup.py
2index 392f2e5..c5c3072 100755
3--- a/setup.py
4+++ b/setup.py
5@@ -52,8 +52,9 @@ setup(
6 'lxml >= 2.3',
7 'pyparsing >= 2.0.0',
8 'requests >= 1.0',
9- 'requests_unixsocket >= 0.1.2',
10- ] + (['configparser'] if sys.version_info.major == 2 else []),
11+ ] + (['configparser'] if sys.version_info.major == 2 else []) + (
12+ ['requests_unixsocket >= 0.1.2']
13+ if sys.version_info >= (3, 5) else []),
14 include_package_data=True,
15 entry_points={
16 'plainbox.parsers': [

Subscribers

People subscribed via source and target branches