Merge ~kissiel/checkbox-support:fix-missing-reqs into checkbox-support:master

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 4d3370035bc2cd0016aa0b342cb4f9c81ad7f138
Merged at revision: e04d87f35164ac4c06198e5045712fb73fce2fa2
Proposed branch: ~kissiel/checkbox-support:fix-missing-reqs
Merge into: checkbox-support:master
Diff against target: 20 lines (+3/-0)
2 files modified
requirements/pip-core.txt (+1/-0)
setup.py (+2/-0)
Reviewer Review Type Date Requested Status
Paul Larson Needs Fixing
Devices Certification Bot Needs Fixing
Taihsiang Ho Approve
Review via email: mp+332055@code.launchpad.net

Description of the change

add missing requests and requests_unixsocket to setup.py

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

+1

review: Approve
Revision history for this message
Paul Larson (pwlars) wrote :

Random thought, not sure if you care, but this should work in recent pythons at least:
     install_requires=[
          'lxml >= 2.3',
          'pyparsing >= 2.0.0',
                 'requests >= 1.0',
                 'requests_unixsocket >= 0.1.2',
                 *(['configparser'] if sys.version_info.major == 2 else []),
     ]
just depends whether you prefer appending it with + or keeping it inline

Revision history for this message
Taihsiang Ho (tai271828) wrote :

Syntax in Paul's comment only work for python3.6 but not python3.5 (default for Xenial) and python3.4 (default for Trusty). We still want to support the default configuration of Xenial and Trusty. I think the MR is ready to go so we could enjoy the fix ASAP.

review: Approve
Revision history for this message
Devices Certification Bot (ce-certification-qa) wrote :

The merge was fine but running tests failed.

[trusty] starting container
[trusty] (timing) 0.00user 0.00system 0:00.12elapsed 6%CPU (0avgtext+0avgdata 5040maxresident)k
[trusty] (timing) 8inputs+72outputs (0major+1429minor)pagefaults 0swaps
[trusty] provisioning container
[trusty] (timing) 22.28user 7.05system 1:33.92elapsed 31%CPU (0avgtext+0avgdata 67668maxresident)k
[trusty] (timing) 268816inputs+1107408outputs (280major+877690minor)pagefaults 0swaps
[trusty-testing] Starting tests...
Found a test script: ./requirements/container-tests-checkbox-support
[trusty-testing] container-tests-checkbox-support: PASS
[trusty-testing] (timing) 22.02user 0.63system 0:25.91elapsed 87%CPU (0avgtext+0avgdata 124556maxresident)k
[trusty-testing] (timing) 4800inputs+53232outputs (36major+161990minor)pagefaults 0swaps
[trusty-testing] Fixing file permissions in source directory
[trusty-testing] Destroying container
Name: trusty-testing
State: STOPPED
[xenial] starting container
[xenial] (timing) 0.00user 0.00system 0:00.17elapsed 4%CPU (0avgtext+0avgdata 4936maxresident)k
[xenial] (timing) 312inputs+72outputs (1major+1424minor)pagefaults 0swaps
[xenial] provisioning container
[xenial] (timing) 23.70user 3.96system 0:53.80elapsed 51%CPU (0avgtext+0avgdata 80352maxresident)k
[xenial] (timing) 293384inputs+1201440outputs (240major+957634minor)pagefaults 0swaps
[xenial-testing] Starting tests...
Found a test script: ./requirements/container-tests-checkbox-support
[xenial-testing] container-tests-checkbox-support: FAIL
[xenial-testing] stdout: https://paste.ubuntu.com/25757928/
[xenial-testing] stderr: https://paste.ubuntu.com/25757929/
[xenial-testing] (timing) Command exited with non-zero status 1
[xenial-testing] (timing) 3.39user 0.21system 0:05.36elapsed 67%CPU (0avgtext+0avgdata 78868maxresident)k
[xenial-testing] (timing) 2720inputs+29752outputs (13major+34401minor)pagefaults 0swaps
[xenial-testing] Fixing file permissions in source directory
[xenial-testing] Destroying container
Name: xenial-testing
State: STOPPED

review: Needs Fixing
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

Let's retry to see if this is not a random LP burp.

Revision history for this message
Devices Certification Bot (ce-certification-qa) wrote :

The merge was fine but running tests failed.

[trusty] starting container
[trusty] (timing) 0.00user 0.00system 0:00.15elapsed 5%CPU (0avgtext+0avgdata 5164maxresident)k
[trusty] (timing) 16inputs+72outputs (0major+1428minor)pagefaults 0swaps
[trusty] provisioning container
[trusty] (timing) 22.11user 7.14system 1:08.99elapsed 42%CPU (0avgtext+0avgdata 67648maxresident)k
[trusty] (timing) 270200inputs+1107408outputs (282major+874411minor)pagefaults 0swaps
[trusty-testing] Starting tests...
Found a test script: ./requirements/container-tests-checkbox-support
[trusty-testing] container-tests-checkbox-support: PASS
[trusty-testing] (timing) 22.23user 0.59system 0:25.47elapsed 89%CPU (0avgtext+0avgdata 124176maxresident)k
[trusty-testing] (timing) 3552inputs+53232outputs (19major+163427minor)pagefaults 0swaps
[trusty-testing] Fixing file permissions in source directory
[trusty-testing] Destroying container
Name: trusty-testing
State: STOPPED
[xenial] starting container
[xenial] (timing) 0.00user 0.00system 0:00.12elapsed 6%CPU (0avgtext+0avgdata 5068maxresident)k
[xenial] (timing) 8inputs+72outputs (0major+1430minor)pagefaults 0swaps
[xenial] provisioning container
[xenial] (timing) 23.70user 3.82system 0:48.27elapsed 57%CPU (0avgtext+0avgdata 80392maxresident)k
[xenial] (timing) 293032inputs+1201448outputs (241major+965022minor)pagefaults 0swaps
[xenial-testing] Starting tests...
Found a test script: ./requirements/container-tests-checkbox-support
[xenial-testing] container-tests-checkbox-support: FAIL
[xenial-testing] stdout: https://paste.ubuntu.com/25759536/
[xenial-testing] stderr: https://paste.ubuntu.com/25759537/
[xenial-testing] (timing) Command exited with non-zero status 1
[xenial-testing] (timing) 3.24user 0.34system 0:05.41elapsed 66%CPU (0avgtext+0avgdata 78260maxresident)k
[xenial-testing] (timing) 2864inputs+29752outputs (28major+35165minor)pagefaults 0swaps
[xenial-testing] Fixing file permissions in source directory
[xenial-testing] Destroying container
Name: xenial-testing
State: STOPPED

review: Needs Fixing
Revision history for this message
Paul Larson (pwlars) wrote :

I've managed to reproduce this, and it is a legitimate failure. If I revert it, it no longer fails.

Requests requires 'chardet>=3.0.2,<3.1.0', but the xenial base systems has chardet 2.3.0 installed from deb. Since the tests run directly in the container and not in a venv, it picks up the package version which is too old.

review: Needs Fixing
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

I wonder why I got:
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[xenial-testing] container-tests-checkbox-support: PASS
[xenial-testing] (timing) 11.26user 0.16system 0:11.58elapsed 98%CPU (0avgtext+0avgdata 118432maxresident)k
[xenial-testing] (timing) 3240inputs+1088outputs (20major+128128minor)pagefaults 0swaps

And also, checkbox-ng's setup.py also requires requests in the same way. How come we don't hit the same problem?

Revision history for this message
Maciej Kisielewski (kissiel) wrote :

Added requests to requirements/pip-core.txt

retrying

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/requirements/pip-core.txt b/requirements/pip-core.txt
2index b6a442f..8036592 100644
3--- a/requirements/pip-core.txt
4+++ b/requirements/pip-core.txt
5@@ -1 +1,2 @@
6 pyparsing==2.0.1
7+requests>=1.1.0
8diff --git a/setup.py b/setup.py
9index 7ca38c7..70187fd 100755
10--- a/setup.py
11+++ b/setup.py
12@@ -51,6 +51,8 @@ setup(
13 install_requires=[
14 'lxml >= 2.3',
15 'pyparsing >= 2.0.0',
16+ 'requests >= 1.0',
17+ 'requests_unixsocket >= 0.1.2',
18 ] + (['configparser'] if sys.version_info.major == 2 else []),
19 include_package_data=True,
20 entry_points={

Subscribers

People subscribed via source and target branches