From d194613dfa5c6f306261c8bf775ef291f079059d Mon Sep 17 00:00:00 2001
From: Andrej Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 27 Mar 2023 14:14:14 +0200
Subject: [PATCH] Phase out OrderedDict usage since xmltodict 0.13 no longer
uses it
Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
---
obs_proxy/worker.py | 16 ++++++++--------
setup.cfg | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/obs_proxy/worker.py b/obs_proxy/worker.py
index faeaa64..f520ebb 100644
--- a/obs_proxy/worker.py
+++ b/obs_proxy/worker.py
@@ -86,11 +86,11 @@ class Worker:
... </worker>''')
Worker(port=1234, hostarch='armv8l', ip='1.2.3.4',
meta={'linux':
- OrderedDict([('version', '4.19.0-14'),
- ('flavor', 'arm64')]),
+ {'version': '4.19.0-14',
+ 'flavor': 'arm64'},
'hardware':
- OrderedDict([('cpu', None),
- ('processors', '8')])},
+ {'cpu': None,
+ 'processors': '8'}},
workerid='worker-1:1')
>>> Worker.fromxml('''
... <worker hostarch="aarch64" ip="4.3.2.1" port="4321" workerid="worker-2:2">
@@ -110,11 +110,11 @@ class Worker:
Worker(port=4321, hostarch='aarch64', ip='4.3.2.1',
meta={'sandbox': 'chroot',
'linux':
- OrderedDict([('version', '4.19.0-5'),
- ('flavor', 'arm64')]),
+ {'version': '4.19.0-5',
+ 'flavor': 'arm64'},
'hardware':
- OrderedDict([('cpu', None),
- ('processors', '24')]),
+ {'cpu': None,
+ 'processors': '24'},
'job': 'debian:bookworm::default::systemd-4834c55cd01c5ef054f079c3af4f9533',
'arch': 'aarch64',
'jobid': '211438592abc7892a636a711f9dc339c'},
diff --git a/setup.cfg b/setup.cfg
index e9b906e..2c61991 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,7 +28,7 @@ install_requires =
json-rpc ~= 1.12
Quart >= 0.11, < 0.18
websockets ~= 10.0
- xmltodict ~= 0.12
+ xmltodict ~= 0.13
aiofiles ~= 0.8
jinja2 ~= 3.0.0
tests_require = obs-proxy[test]
--
GitLab