Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include mbed-greentea==1.7.1 for mbed-os-tools==0.0.8 #10614

Merged
merged 1 commit into from May 23, 2019

Conversation

Projects
None yet
5 participants
@takuti
Copy link
Contributor

commented May 20, 2019

mbed-greentea<1.7 depends on mbed-os-tools<0.0.8, while the other
dependent packages require mbed-os-tools=0.0.8. Fixing this
inconsistency.

Description

Current requirements.txt doesn't work as:

$ pip install -r requirements.txt
...
$ pip check
mbed-greentea 1.6.5 has requirement mbed-os-tools==0.0.6, but you have mbed-os-tools 0.0.8.

This PR fixes the issue.

Pull request type

[x] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change
@takuti

This comment has been minimized.

Copy link
Contributor Author

commented May 20, 2019

@ciarmcom ciarmcom requested a review from ARMmbed/mbed-os-maintainers May 20, 2019

@ciarmcom

This comment has been minimized.

Copy link
Member

commented May 20, 2019

@takuti, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

@@ -14,7 +14,7 @@ Jinja2>=2.10.1,<2.11
intelhex>=1.3,<=2.2.1
mbed-ls>=1.5.1,<1.8
mbed-host-tests>=1.4.4,<1.6
mbed-greentea>=0.2.24,<1.7
mbed-greentea>=0.2.24,<=1.7.1

This comment has been minimized.

Copy link
@0xc0170

0xc0170 May 20, 2019

Member

Assuming you got latest greentea, this fixes the issue. But shouldn't this be <1.8 rather - if we are already going pass 1.7 version

@bridadan Please review

This comment has been minimized.

Copy link
@0xc0170

0xc0170 May 22, 2019

Member

@ARMmbed/mbed-os-tools mbed-greentea>=0.2.24,<1.8 would be the best here? Locally tested , fixes the error with dependency issue I had today.

This comment has been minimized.

Copy link
@takuti

takuti May 22, 2019

Author Contributor

I agree with you. Just updated as you suggested. Waiting for review from the other people.

@0xc0170

This comment has been minimized.

Copy link
Member

commented May 22, 2019

@ARMmbed/mbed-os-tools Please review

I am getting now after latest fetch, an error like this:

for mbed test command:

Test Case:
    Name: tests-usb_device-serial
    Path: .\TESTS\usb_device\serial
Traceback (most recent call last):
  File "python37-32\lib\site-packages\pkg_resources\__init__.py", line 583, in _build_master
    ws.require(__requires__)
  File "python37-32\lib\site-packages\pkg_resources\__init__.py", line 900, in require
    needed = self.resolve(parse_requirements(requirements))
  File "python37-32\lib\site-packages\pkg_resources\__init__.py", line 791, in resolve
    raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (mbed-os-tools 0.0.8 (c:\programs\python37-32\lib\site-packages), Requirement.parse('mbed-os-tools==0.0.6'), {'mbed-greentea'})
Include mbed-greentea==1.7 for mbed-os-tools==0.0.8
mbed-greentea<1.7 depends on mbed-os-tools<0.0.6, while the other
dependent packages require mbed-os-tools=0.0.8. Fixing this
inconsistency.

@takuti takuti force-pushed the takuti:fix-dependent-mbed-greentea-version branch from a91c639 to 9bc7e7c May 22, 2019

@0xc0170

This comment has been minimized.

Copy link
Member

commented May 22, 2019

CI started

@0xc0170 0xc0170 added needs: CI and removed needs: review labels May 22, 2019

@mbed-ci

This comment has been minimized.

Copy link

commented May 22, 2019

Test run: FAILED

Summary: 1 of 11 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_exporter
@0xc0170

This comment has been minimized.

Copy link
Member

commented May 22, 2019

exporters restarted

@0xc0170 0xc0170 added ready for merge and removed needs: CI labels May 23, 2019

@0xc0170 0xc0170 merged commit 319a82d into ARMmbed:master May 23, 2019

26 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci/build-ARM Success
Details
jenkins-ci/build-GCC_ARM Success
Details
jenkins-ci/build-IAR Success
Details
jenkins-ci/cloud-client-test Success
Details
jenkins-ci/dynamic-memory-usage Success
Details
jenkins-ci/exporter Success
Details
jenkins-ci/greentea-test Success
Details
jenkins-ci/mbed2-build-ARM Success
Details
jenkins-ci/mbed2-build-GCC_ARM Success
Details
jenkins-ci/mbed2-build-IAR Success
Details
jenkins-ci/unittests Success
Details
travis-ci/astyle Success!
Details
travis-ci/docs Success!
Details
travis-ci/doxy-spellcheck Success!
Details
travis-ci/events Success! Runtime is 8597 cycles.
Details
travis-ci/gitattributestest Success!
Details
travis-ci/include_check Success!
Details
travis-ci/licence_check Success!
Details
travis-ci/littlefs Success! Code size is 8448B.
Details
travis-ci/psa-autogen Success!
Details
travis-ci/tools-py2.7 Success!
Details
travis-ci/tools-py3.5 Success!
Details
travis-ci/tools-py3.6 Success!
Details
travis-ci/tools-py3.7 Success!
Details

@takuti takuti deleted the takuti:fix-dependent-mbed-greentea-version branch May 23, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.