jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/docker-compose: update patch to allow all pyyaml 5.x versions

Browse Source 
The recent bump of python-pyyaml to version 5.3 causes a runtime
failure in docker-compose:

pkg_resources.ContextualVersionConflict: (PyYAML 5.3 (/usr/lib/python3.8/site-packages), Requirement.parse('PyYAML<5.2,>=3.10'), {'docker-compose'})

https://gitlab.com/buildroot.org/buildroot/-/jobs/442151461

Fix it by adjusting 0003-support-PyYAML-up-to-5.1-version.patch to
allow all pyyaml 5.x versions, similar to what upstream has done
post-1.24.1:

c818bfc62c

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Peter Korsgaard 2020-02-26 23:19:11 +01:00 committed by Thomas Petazzoni
parent 86441b9fd6
commit ad4dd41c03
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
View File

@ -6,6 +6,7 @@ Subject: [PATCH] support PyYAML up to 5.1 version
Signed-off-by: Sergey Fursov <geyser85@gmail.com> Signed-off-by: Sergey Fursov <geyser85@gmail.com>
[Upstream: https://github.com/docker/compose/pull/6623] [Upstream: https://github.com/docker/compose/pull/6623]
(cherry picked from commit d2ca096f46a56cd4db494c593ed84e5c255dc15d) (cherry picked from commit d2ca096f46a56cd4db494c593ed84e5c255dc15d)
[Peter: allow all 5.x]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
--- ---
requirements.txt | 2 +- requirements.txt | 2 +-
@ -34,7 +35,7 @@ index c9e4729d..17ab678e 100644
'cached-property >= 1.2.0, < 2', 'cached-property >= 1.2.0, < 2',
'docopt >= 0.6.1, < 1', 'docopt >= 0.6.1, < 1',
- 'PyYAML >= 3.10, < 5', - 'PyYAML >= 3.10, < 5',
+ 'PyYAML >= 3.10, < 5.2', + 'PyYAML >= 3.10, < 6',
'requests >= 2.20.0, < 3', 'requests >= 2.20.0, < 3',
'texttable >= 0.9.0, < 2', 'texttable >= 0.9.0, < 2',
'websocket-client >= 0.32.0, < 1', 'websocket-client >= 0.32.0, < 1',