| Message ID | 1542290295-26953-1-git-send-email-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | f6206f8587fc7ec82a57dbbeb5de0f94b3c2ef49 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] travis: Ensure we use pytest 2.8.7 | expand |
On Thu, Nov 15, 2018 at 08:58:15AM -0500, Tom Rini wrote: > The latest version of pytest (4.0.0) makes some of the code we have in > test/py/conftest.py a fatal error that needs to be migrated. > Unfortunately this in turn requires changes that don't exist in older > versions of pytest such as 2.8.7 that ships with Ubuntu 16.04. Force > travis to use this older version of pytest. > > Signed-off-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/.travis.yml b/.travis.yml index 6ce2ef7fbaaa..a061f02399c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ install: - cat ~/.buildman - virtualenv /tmp/venv - . /tmp/venv/bin/activate - - pip install pytest + - pip install pytest==2.8.7 - pip install python-subunit - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - grub-mkimage -o ~/grub_x64.efi -O x86_64-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd
The latest version of pytest (4.0.0) makes some of the code we have in test/py/conftest.py a fatal error that needs to be migrated. Unfortunately this in turn requires changes that don't exist in older versions of pytest such as 2.8.7 that ships with Ubuntu 16.04. Force travis to use this older version of pytest. Signed-off-by: Tom Rini <trini@konsulko.com> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)