Mirror of git.openembedded.org/meta-openembedded https://git.enea.com/cgit/linux/meta-openembedded.git/atom?h=sumo 2018-08-19T14:19:58+00:00 2018-08-19T14:19:58+00:00 leimaohui leimaohui@cn.fujitsu.com 2018-05-28T00:34:16+00:00 urn:sha1:7825bc0ed57c5da0fafd260b5e81346410582e33 file /usr/bin/py.test conflicts between attempted installs of python3-pytest-3.4.2-r0 and python-pytest-3.4.2-r0 file /usr/bin/pytest conflicts between attempted installs of python3-pytest-3.4.2-r0 and python-pytest-3.4.2-r0 Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 28fab4c8f547d45b80bb7b06d33a6c6c1ea74efc) Signed-off-by: Armin Kuster <akuster808@gmail.com> 2018-03-29T23:51:44+00:00 Huang Qiyu huangqy.fnst@cn.fujitsu.com 2018-03-21T03:36:17+00:00 urn:sha1:99d18a6bc1a915ef5f07116e0fe684f56825a165 1.Upgrade python-pytest from 3.4.1 to 3.4.2. 2.Modify pytest_version_fix.patch, since the data has been changed. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>