From d20750f3298c8c745de817c5b6d62fd17079ecdb Mon Sep 17 00:00:00 2001
From: Benjamin Bradnick <ben.bradnick@diamond.ac.uk>
Date: Thu, 24 Feb 2022 13:21:18 +0000
Subject: [PATCH 1/2] Bump dependencies for p4p 4.0

---
 Pipfile.lock | 467 +++++++++++++++++++++++++++++++--------------------
 setup.cfg    |   2 +-
 2 files changed, 285 insertions(+), 184 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 2d787a9e8..05c0724ec 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -32,6 +32,57 @@
             ],
             "version": "==2.17"
         },
+        "coverage": {
+            "hashes": [
+                "sha256:0147f7833c41927d84f5af9219d9b32f875c0689e5e74ac8ca3cb61e73a698f9",
+                "sha256:04a92a6cf9afd99f9979c61348ec79725a9f9342fb45e63c889e33c04610d97b",
+                "sha256:10ab138b153e4cc408b43792cb7f518f9ee02f4ff55cd1ab67ad6fd7e9905c7e",
+                "sha256:2e5b9c17a56b8bf0c0a9477fcd30d357deb486e4e1b389ed154f608f18556c8a",
+                "sha256:326d944aad0189603733d646e8d4a7d952f7145684da973c463ec2eefe1387c2",
+                "sha256:359a32515e94e398a5c0fa057e5887a42e647a9502d8e41165cf5cb8d3d1ca67",
+                "sha256:35cd2230e1ed76df7d0081a997f0fe705be1f7d8696264eb508076e0d0b5a685",
+                "sha256:3b270c6b48d3ff5a35deb3648028ba2643ad8434b07836782b1139cf9c66313f",
+                "sha256:42a1fb5dee3355df90b635906bb99126faa7936d87dfc97eacc5293397618cb7",
+                "sha256:479228e1b798d3c246ac89b09897ee706c51b3e5f8f8d778067f38db73ccc717",
+                "sha256:4cd919057636f63ab299ccb86ea0e78b87812400c76abab245ca385f17d19fb5",
+                "sha256:4d8b453764b9b26b0dd2afb83086a7c3f9379134e340288d2a52f8a91592394b",
+                "sha256:51a441011a30d693e71dea198b2a6f53ba029afc39f8e2aeb5b77245c1b282ef",
+                "sha256:557594a50bfe3fb0b1b57460f6789affe8850ad19c1acf2d14a3e12b2757d489",
+                "sha256:572f917267f363101eec375c109c9c1118037c7cc98041440b5eabda3185ac7b",
+                "sha256:62512c0ec5d307f56d86504c58eace11c1bc2afcdf44e3ff20de8ca427ca1d0e",
+                "sha256:65ad3ff837c89a229d626b8004f0ee32110f9bfdb6a88b76a80df36ccc60d926",
+                "sha256:666c6b32b69e56221ad1551d377f718ed00e6167c7a1b9257f780b105a101271",
+                "sha256:6e994003e719458420e14ffb43c08f4c14990e20d9e077cb5cad7a3e419bbb54",
+                "sha256:72bf437d54186d104388cbae73c9f2b0f8a3e11b6e8d7deb593bd14625c96026",
+                "sha256:738e823a746841248b56f0f3bd6abf3b73af191d1fd65e4c723b9c456216f0ad",
+                "sha256:78287731e3601ea5ce9d6468c82d88a12ef8fe625d6b7bdec9b45d96c1ad6533",
+                "sha256:7833c872718dc913f18e51ee97ea0dece61d9930893a58b20b3daf09bb1af6b6",
+                "sha256:7e083d32965d2eb6638a77e65b622be32a094fdc0250f28ce6039b0732fbcaa8",
+                "sha256:8186b5a4730c896cbe1e4b645bdc524e62d874351ae50e1db7c3e9f5dc81dc26",
+                "sha256:8605add58e6a960729aa40c0fd9a20a55909dd9b586d3e8104cc7f45869e4c6b",
+                "sha256:977ce557d79577a3dd510844904d5d968bfef9489f512be65e2882e1c6eed7d8",
+                "sha256:994ce5a7b3d20981b81d83618aa4882f955bfa573efdbef033d5632b58597ba9",
+                "sha256:9ad5895938a894c368d49d8470fe9f519909e5ebc6b8f8ea5190bd0df6aa4271",
+                "sha256:9eb0a1923354e0fdd1c8a6f53f5db2e6180d670e2b587914bf2e79fa8acfd003",
+                "sha256:a00284dbfb53b42e35c7dd99fc0e26ef89b4a34efff68078ed29d03ccb28402a",
+                "sha256:a11a2c019324fc111485e79d55907e7289e53d0031275a6c8daed30690bc50c0",
+                "sha256:ab6a0fe4c96f8058d41948ddf134420d3ef8c42d5508b5a341a440cce7a37a1d",
+                "sha256:b1d0a1bce919de0dd8da5cff4e616b2d9e6ebf3bd1410ff645318c3dd615010a",
+                "sha256:b8e4f15b672c9156c1154249a9c5746e86ac9ae9edc3799ee3afebc323d9d9e0",
+                "sha256:bbca34dca5a2d60f81326d908d77313816fad23d11b6069031a3d6b8c97a54f9",
+                "sha256:bf656cd74ff7b4ed7006cdb2a6728150aaad69c7242b42a2a532f77b63ea233f",
+                "sha256:c95257aa2ccf75d3d91d772060538d5fea7f625e48157f8ca44594f94d41cb33",
+                "sha256:dc5023be1c2a8b0a0ab5e31389e62c28b2453eb31dd069f4b8d1a0f9814d951a",
+                "sha256:e14bceb1f3ae8a14374be2b2d7bc12a59226872285f91d66d301e5f41705d4d6",
+                "sha256:e3c4f5211394cd0bf6874ac5d29684a495f9c374919833dcfff0bd6d37f96201",
+                "sha256:e76f017b6d4140a038c5ff12be1581183d7874e41f1c0af58ecf07748d36a336",
+                "sha256:e7d5606b9240ed4def9cbdf35be4308047d11e858b9c88a6c26974758d6225ce",
+                "sha256:f0f80e323a17af63eac6a9db0c9188c10f1fd815c3ab299727150cc0eb92c7a4",
+                "sha256:fb2fa2f6506c03c48ca42e3fe5a692d7470d290c047ee6de7c0f3e5fa7639ac9",
+                "sha256:ffa8fee2b1b9e60b531c4c27cf528d6b5d5da46b1730db1f4d6eee56ff282e07"
+            ],
+            "version": "==6.1.1"
+        },
         "decorator": {
             "hashes": [
                 "sha256:41fa54c2a0cc4ba648be4fd43cff00aedf5b9465c9bf18d64325bc225f08f760"
@@ -40,33 +91,36 @@
         },
         "epicscorelibs": {
             "hashes": [
-                "sha256:04d5118bef5d811fd7edfb07e932b16ffb119b099aa9c438f0796f8c43fde870",
-                "sha256:15877ff982ded4f18bce10df603f0c8d92a1721028e53af69d06c14f1b55437c",
-                "sha256:18bc2cea2c532337afc9ba1cd4c029dcbe89e025dea064f3fcff8fc3c2980800",
-                "sha256:1aae34eab3634f1e7ca5c95a3f54f92491381dbc54d426ba704412be998b9ea4",
-                "sha256:1db0a62b83dc5ac94b3593f86248c5532277bc48247c9f5112cf199aafe920d1",
-                "sha256:1e36e8de2abe67c23ff8fcb41912468847f7e4785969b42ef1075f697295c0be",
-                "sha256:27ece87b4fabd04e536dbbf083461274ed61e2d132307526ca3cca4a98359b88",
-                "sha256:2aea6ad97b7772f11f94ba7446ad860f4cdd1146cf30e0950ef34f0d6134baab",
-                "sha256:317dfa567eece806eecefeafe2a7eb6ac90db4f216f39763c39854959ff4e72c",
-                "sha256:43d4d7701a0bada7ed921ec3c6af069ea02137b55268252ebca49207a7ef6351",
-                "sha256:4906fbaa76f89dee3d51b051a78fbd4bf12b80cdee4543d741a63b9999add120",
-                "sha256:49763288bc8fadf7807c8ab19ed0e19795287205537ba463c214c5d0c15b25e3",
-                "sha256:511fad578f2eddbf9fe163666d2171081fe1785440633eba311f2d531a544de4",
-                "sha256:521b05a72b66955bc80a19c8c0e96e1daa12cf5b68b340e40d7cf49dd34b6a92",
-                "sha256:54d4aa0d367e6a639aaa787a4468a33fe359d1dd62bcd10aef7c1e8afc8bd4eb",
-                "sha256:79a68c491e79984b7b966325686f43d9a1e59ebfb593debedb110ed49735e0e0",
-                "sha256:7c53db21b5809be7fb6b6f93187103ab200d2a41a0851e7e827fcdb6b7f699b3",
-                "sha256:8071e1866b57ff6e2579e74dcc53af87421c98bad4684501f526afefc14b7358",
-                "sha256:874fee009d4a392d4e6fd6e550b8d43ab63ad303c78b3d000267a34c33da4f76",
-                "sha256:8f803ceaec535741fcd7ff7adccf8dfbca4ca5aeef60e85a0f36f36d16e57fb3",
-                "sha256:cc4e4158e4ebc288b9d3890c6f8cb14fec38f40bd8ce3f239d9a9e566890d131",
-                "sha256:cf638d6ccb0cbc82f14c8ed4d0c56f55317ebc5b272a6dec0fbf51e76dfad552",
-                "sha256:e3d3733e2c433d599a71c9784ff1fdc031fddaeb8e8c3a7d094064b46252f9dd",
-                "sha256:e45621fd3c9bc46e820835594213313e71f636966c3f2832f031ca7d5466c681",
-                "sha256:e571e90306b8a8248c182763e94d1a8f17573288f5e61ac6aad35da7597404c4"
-            ],
-            "version": "==7.0.6.99.1.0"
+                "sha256:01d45ae25d844afe71893838f36ea649ccc3e1e72a96076b33242437efb1ce13",
+                "sha256:0269ba469aa8117d86e865b09e9f3b3afdb891f5f544a90d8af037039015b995",
+                "sha256:1c6f00360ab2e89081c031ff499f5695bd687102a561160cf6304b64cf325ca5",
+                "sha256:1cbed1cb9b7fa3744723dfb78a1aaa7ff9d475e9dee6e6e21ebb1e682421cd35",
+                "sha256:223515de1da16fd7a06892e41a1e5bc870b57bbf1a0a4ac3dc3e069b647d7313",
+                "sha256:329179971288722eb7f7d085fced198ff30468cc225d9677f08175074680b4ef",
+                "sha256:32f91502afa9639fe576fa5bfa137352ee04f929d2887a2c7c169c24c0658808",
+                "sha256:3c8958b7c3385dc190948af429a7c10d18e71142d749776250341e1db6b3d05b",
+                "sha256:3eb16a21760110e0d159e7ee0f97a36250a83abc0ca6ec08806d4ad148c48761",
+                "sha256:3f07babd8ff1c7499cbe9f95dd80a8cbee45f9f38bda2f6c72855c4c647d2dc7",
+                "sha256:5766a0dafcd02af7ecead064d5502282eac1c66afdddf7235ae822228eedac11",
+                "sha256:5a18ab11d8a565b9ea9e035218b5ac44b86d21162d7260ecb54fad43f506d70f",
+                "sha256:64dd24d80b8dd1bca73ce8ffe0673306cf7018dba61883bd1b7b4ff179ac0623",
+                "sha256:773d51ade8a9c44333a56aae1224afe4c238750643c5a05a461186d9ce7f4cf6",
+                "sha256:86921315b855993c0316eb938586c8b99acc21ba5ed26ac0cb66d32e1682f89b",
+                "sha256:941643c2e90665305deddc4a7fe99dceb5488c80d1c31bd4a96169a92adea73f",
+                "sha256:9a4b401e22a96b9cacc2429f67179fed4a1414e5629f78865d6c63d92ec19439",
+                "sha256:9be6cf03ad466812cd659fa2a6af1c8efd33946abdf0a2c5f8901df2289f2dda",
+                "sha256:a9e07998cca913e6cf5f448c37dc1c2f29acc5fec4aca19ed80cd127b65e5d69",
+                "sha256:ac260dbd4b28a53c8ebac4f902d03448432b46d3fff7809488a63263b7efbd05",
+                "sha256:b0d606a0c0c020387136b1b19091d661b1b2f5763377d6a0b13152351f42ad53",
+                "sha256:b64b38b4f48601054a7bd0423d1559c1a2281cb962fd4cd4c1088f49ac29b2b7",
+                "sha256:b69e91fe38f818a71fd4fbf22ac17d577bdce914d4940883586e57d629030328",
+                "sha256:c3deebf918866f5bdd4fbc5f52b1c89c96121619573698442876eecdf1f9a985",
+                "sha256:cbb5a14534e68eb2a10904ba020191c858860f2dfebbdff969d160a29020724e",
+                "sha256:d729c35c29681acc3b666e59f041e6bd228c931b8303507bb046e331e5f11f67",
+                "sha256:f165e4754249ee12bd38ba68ed72dc27764b28a02654c224c690f68b95519455",
+                "sha256:f40ae0290be4d84c560f848f4b0340b3c9ff466bd52fcbd11899199fa0be9b4b"
+            ],
+            "version": "==7.0.6.99.2.0"
         },
         "h5py": {
             "hashes": [
@@ -133,13 +187,12 @@
             ],
             "version": "==0.1.3"
         },
-        "nose": {
+        "nose2": {
             "hashes": [
-                "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac",
-                "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a",
-                "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"
+                "sha256:6d208d7d6ec9f9d55c74dac81c9394bc3906dbef81a8ca5420b2b9b7f8e69de9",
+                "sha256:d37e75e3010bb4739fe6045a29d4c633ac3146cb5704ee4e4a9e4abeceb2dee3"
             ],
-            "version": "==1.3.7"
+            "version": "==0.11.0"
         },
         "numpy": {
             "hashes": [
@@ -178,33 +231,36 @@
         },
         "p4p": {
             "hashes": [
-                "sha256:0143a3a3d29bf03f7c828c28d025db81961e9933c750bd9d3d8e8b59cb8b71a3",
-                "sha256:160aa3dd5ca55583e929bcc939e0479dfca655fba440dc9b931373e733848959",
-                "sha256:1c688e35e30294c79bfebbda8c460ffb5486cdb64ccbeae93060e6de667942a4",
-                "sha256:1d58c9149b85e0fd19e00167fb047a04c1e649d394cf8fdcb7a172be73de3f6d",
-                "sha256:25e98f73ae4cebc3c305f2b11b0e6689d002594fda9330bf99c6414d0a01753f",
-                "sha256:2b4e193737cb69a20fbed2f86360275ce5dcce5ca83439e1f98b3af5f1aed1cc",
-                "sha256:30d0e083b5dfecee7693d197125daac3e5da9466e50dea0d01d5356abf5c6143",
-                "sha256:34ab524b4ce32dc67ef33421db644d6713ed677f601cbbef7007957f9cb6eb9c",
-                "sha256:3e257761347bf14e66f7a07bb4fda803c1293c3ca8b26baf5818ad66e2d46abb",
-                "sha256:3ec002d4e04ea5c99b33840f71c1042c33d4b13b20e32980b7a0a7eb71195ec4",
-                "sha256:79bd0bcb586d043a3565238be2f002ddf125bb710b4a46b330632a706d36ba08",
-                "sha256:7a004c518ba6abbb4ff96647e5ced0e1329d965448cbdc23709a8b6a3d040b26",
-                "sha256:977dc659a16481603716c655b7cae406e79d7788bd387b64994c198d3a27e19f",
-                "sha256:99c9dc61af4e8323bb77418d0c868717a838d424081156ac31b95957965f901f",
-                "sha256:a922287fd85973bbc900f629f5d475fe9be37eb2d3929fe81405c3ebcd950807",
-                "sha256:bf58b00da603378027cb1af265d0d0ccfa40cdc02263bdebbb4f56837d809512",
-                "sha256:c20592bb15a087add723d84484d95a9e428045a20afc7a791ccdad3e48113a39",
-                "sha256:c46c615896fa0daea5a5942c4b7b51be2bf3f8dfdcc2c05e256f2c957e3353eb",
-                "sha256:c745d18146bf48762806d724b8f265c046196ddb0a1dd15c7aee0919362cbb63",
-                "sha256:c9d5769c31b2700ece9c04aa8c0fc2efe95af8d473b35307d03210ff31d28831",
-                "sha256:cfd500cfa8d3f227704e8f4ff6bafee66bc5459fc56ece7792c334b92be2d35a",
-                "sha256:dda7008629e8232a372b798197dcebc5583eadc0ed643568543ee4afd0387928",
-                "sha256:f014907d2fd51ce132a29b1e869ea4058ead0cc14bcc2ed1690a08752c72ba62",
-                "sha256:f4677018469c7b98434dd465f1210f2ebd13a23d7084187666393a45b2ff7f26",
-                "sha256:f4ce7f6dd0e45f1acc05e0a633b3e18045b576c43394790719dcafb71a5daa13"
-            ],
-            "version": "==3.5.4"
+                "sha256:0120476428d216440c3b30f3463158686c5a2bd1c08a74b2c01218f6c6208f4e",
+                "sha256:097dd63fba31ea1e4474c11bc2c13f4a84220beb58126692caea21c1b15dd589",
+                "sha256:19b3438068f14d77c92286652ba8e62afe61e98d620ccbab44e732118ec5216d",
+                "sha256:1a7f7a49a68d55efe625cef0f4fec761e0c5be45d438ee6e3bf58047792a8006",
+                "sha256:2a98916ce5e856717a6133f3a56863ab288ba4016e3e5c032f924810b09aa238",
+                "sha256:311995b3cdfc1c80498de752a914b7e97a3264753d463dbf3fa9724d9cf32dde",
+                "sha256:38bf3b861e67fa751a8f914f01f6729c09d960d2e2bc1d449f39fc5d7c563d0e",
+                "sha256:3c151edd6d8f68451be8b92326bc20f81fecf7025ecb703ef57d655ed77ea749",
+                "sha256:44764e0334469733775ceb06e0e9ed7784d81b6ae43278176cb249de72237495",
+                "sha256:46a4bd867e7543205663ad1f703e26566e337877715c5f60059e779061d7517d",
+                "sha256:50b555ec84a2a8377f28e42e6a1873f728398d51a8b6bf2e337e3e24b94338b4",
+                "sha256:60a659208adcb88f7f40f79203414cbc6bca1a4e6c238ea2abd29a02a356d12f",
+                "sha256:6e2a17c4b515d62668cd488895e5631056a25e8809f6bd0308da7bd8d60c7c84",
+                "sha256:721c88449c559c5036fe4099e33e6cb7748848f5d4b7412afc7276eb538859a3",
+                "sha256:8acd9c75c741dcd769c4691e4e89eca1bf17ebac5688efc0fb71749cd6ea5f13",
+                "sha256:92fa5a5b4ae9d2b742324c1c8fbd1c920f13d8aef9519320d6b53cfd0cad1caa",
+                "sha256:99b0bca100df27344266ebf6c3b999dd5305782f861060fc5f58656690735e73",
+                "sha256:a2abd4654101daa0b18e8401beee532498fc767df8931f091c0279da27b62bb5",
+                "sha256:b30cc7efe3dcfdd91379466d1d4794e8a96a1169b62bfc4da7f40e6314d81823",
+                "sha256:b925a6eb334e2059b5f617d3320b513afd917ebc8a62ff0e71f45242cb9dd0af",
+                "sha256:ba5911d010acba269918c782458b7fde3ba97e618b1f6506d2b4521b2d5dd08f",
+                "sha256:bc8d130270de984b4b7951bae79092bf42ff22a30cd7d92c3bddb46133a192f7",
+                "sha256:c81a4beae54b75d9a7ba175503753fa08c7048d365eb41b4ebb1edff3d5563e4",
+                "sha256:cca541c24923e6af27310499d4826cd91fcad9d28566ca69d11394c8d0f23725",
+                "sha256:db7afdb655db989a5b4bf0cfc2b0e7a0049bd4bed0a62c14be45e61e02a06b60",
+                "sha256:e29be7d5c2059d5dd22cd0da8af371215aaebee038f5ffb7d1cc83213c1d9325",
+                "sha256:e55d9e94fc7fbe1c28b33550a00e6e4da68935247e110b2861d049ae89982d71",
+                "sha256:fd5c8af30c523957dd32e874932a7b1af29ae9f2f965775ada5e72f9b7eda5e2"
+            ],
+            "version": "==4.0.0"
         },
         "packaging": {
             "hashes": [
@@ -261,6 +317,40 @@
             ],
             "version": "==0.7.0"
         },
+        "pvxslibs": {
+            "hashes": [
+                "sha256:02dfd4e90605ffc66b43f8f7a3a1de35b4bae5b47b4ab4646e2b70a1f7383592",
+                "sha256:04e533703cf4f7f5b7e20ba433b99e215dc784c0c140eb358e1e0e59dcecbd51",
+                "sha256:0dbdccd4149ab1cc28a6a0e314020a95865360d81a8c2e3145a2da40cc67d7c8",
+                "sha256:1c42087745bd7624cecdbce462a001a207c61fe772a50a1536f0640dd0da6239",
+                "sha256:205ddcb94d40fc4f43483d2e879f7bd41d41ace854a9366901ea6b73f6189405",
+                "sha256:27e1f9379de1056d0846696a4cc3c0c216a6ad74e4e7cab3707845a2b7666f2d",
+                "sha256:2bb9b4d1d2b06fe9c20e1c96e584551a408c0e76ce1358fc3788031bbdbb754f",
+                "sha256:31d50f8187e908d7bb0eb9451d1ac3cb12ddb02352faf48f266b2e6d4965ed2c",
+                "sha256:33c99c77613bfcfa9882e2bd946db29a9158c3e4f1a9187bda8aea121aa1ae4c",
+                "sha256:36ecad4ae233510b883fd6367b4801a2c7524e12033999ba619561953fb2f4fe",
+                "sha256:51a6a8fc1cc6ec617296cec3405c74612de04e51589a3cb0e3313cb190e95869",
+                "sha256:5708dadb61fd2acef99aac525154e228c3b666fb5e9fe9fa34416dbc7738d987",
+                "sha256:68b29ed99d280989be84cfc7994405b988020aeeebf6de63a245e1ca305c321f",
+                "sha256:719d6afd7a98752f060169aa6ed7c036af2f7daae9ded11ceb7f94c93f6d4d09",
+                "sha256:7cc9e36a5926fc8badee059ed5d56d851da7c77a23f825494bac0d0ec80c4206",
+                "sha256:7d26553c39580ec653a5b9ef828511a0f409f9d90a4224bb2e6a99abdfce5bfd",
+                "sha256:883b3c03d16152087d4556d8edb9a7efe0888a6e44f4c5606aa801a6f19b47ae",
+                "sha256:99a0047a30145ec69a38deb9c6eb3df8404609751578093238da44d75fe8e3d7",
+                "sha256:a2430d61412b7d5a7e2112f2591e1eee04630b71db2f3023fe269f90868a9050",
+                "sha256:b116fd264e1d6cbf3c5f2ed795c375d9046485e5c76b995f6f10537d814afeb1",
+                "sha256:b8103b6a4d9dfb37b2f5a84e65af7ffe8aa6ca719776a2a59b1df95d73824644",
+                "sha256:bcd25ca806e0393ed9c66e5488b2c63b1a31adf7e2abf6efc7f75f23206d7adc",
+                "sha256:cc145ff7f9971cb65e182e64a76e06941f45942ec135bf5a6dd73f56a9845a86",
+                "sha256:ce732420bc888d235ded1210d03c9ef4e82b5f672c1ed61613e21e9c37d69c88",
+                "sha256:eda32d9ca73348257ad6038b028f7f854c66a18483dd8d0615e6f3e61f34cc75",
+                "sha256:ee51a24fc63e96a649e5bb2cf111414f1fa9be993a3fbbcb64677ef9c09ceee1",
+                "sha256:f29bc3e2efba7f9002e6e180cae88af564ee5e382743f821066c133cd4b5150e",
+                "sha256:f599c70a06b59fd0e18ff3ee77a62788865e4e2583179da86c6f3d1284fc77f3"
+            ],
+            "markers": "python_version >= '2.7'",
+            "version": "==0.2.2"
+        },
         "pygelf": {
             "hashes": [
                 "sha256:3693da38794561d42b0556a78af7dcb22d92ea450125577e58089ab89a890ee5",
@@ -423,13 +513,6 @@
             ],
             "version": "==0.21"
         },
-        "appdirs": {
-            "hashes": [
-                "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41",
-                "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"
-            ],
-            "version": "==1.4.4"
-        },
         "astroid": {
             "hashes": [
                 "sha256:bc58d83eb610252fd8de6363e39d4f1d0619c894b0ed24603b881c02e64c7386"
@@ -465,10 +548,31 @@
         },
         "black": {
             "hashes": [
-                "sha256:1fc0e0a2c8ae7d269dfcf0c60a89afa299664f3e811395d40b1922dff8f854b5",
-                "sha256:e5cf21ebdffc7a9b29d73912b6a6a9a4df4ce70220d523c21647da2eae0751ef"
-            ],
-            "version": "==21.5b2"
+                "sha256:07e5c049442d7ca1a2fc273c79d1aecbbf1bc858f62e8184abe1ad175c4f7cc2",
+                "sha256:0e21e1f1efa65a50e3960edd068b6ae6d64ad6235bd8bfea116a03b21836af71",
+                "sha256:1297c63b9e1b96a3d0da2d85d11cd9bf8664251fd69ddac068b98dc4f34f73b6",
+                "sha256:228b5ae2c8e3d6227e4bde5920d2fc66cc3400fde7bcc74f480cb07ef0b570d5",
+                "sha256:2d6f331c02f0f40aa51a22e479c8209d37fcd520c77721c034517d44eecf5912",
+                "sha256:2ff96450d3ad9ea499fc4c60e425a1439c2120cbbc1ab959ff20f7c76ec7e866",
+                "sha256:3524739d76b6b3ed1132422bf9d82123cd1705086723bc3e235ca39fd21c667d",
+                "sha256:35944b7100af4a985abfcaa860b06af15590deb1f392f06c8683b4381e8eeaf0",
+                "sha256:373922fc66676133ddc3e754e4509196a8c392fec3f5ca4486673e685a421321",
+                "sha256:5fa1db02410b1924b6749c245ab38d30621564e658297484952f3d8a39fce7e8",
+                "sha256:6f2f01381f91c1efb1451998bd65a129b3ed6f64f79663a55fe0e9b74a5f81fd",
+                "sha256:742ce9af3086e5bd07e58c8feb09dbb2b047b7f566eb5f5bc63fd455814979f3",
+                "sha256:7835fee5238fc0a0baf6c9268fb816b5f5cd9b8793423a75e8cd663c48d073ba",
+                "sha256:8871fcb4b447206904932b54b567923e5be802b9b19b744fdff092bd2f3118d0",
+                "sha256:a7c0192d35635f6fc1174be575cb7915e92e5dd629ee79fdaf0dcfa41a80afb5",
+                "sha256:b1a5ed73ab4c482208d20434f700d514f66ffe2840f63a6252ecc43a9bc77e8a",
+                "sha256:c8226f50b8c34a14608b848dc23a46e5d08397d009446353dad45e04af0c8e28",
+                "sha256:ccad888050f5393f0d6029deea2a33e5ae371fd182a697313bdbd835d3edaf9c",
+                "sha256:dae63f2dbf82882fa3b2a3c49c32bffe144970a573cd68d247af6560fc493ae1",
+                "sha256:e2f69158a7d120fd641d1fa9a921d898e20d52e44a74a6fbbcc570a62a6bc8ab",
+                "sha256:efbadd9b52c060a8fc3b9658744091cb33c31f830b3f074422ed27bad2b18e8f",
+                "sha256:f5660feab44c2e3cb24b2419b998846cbb01c23c7fe645fee45087efa3da2d61",
+                "sha256:fdb8754b453fb15fad3f72cd9cad3e16776f0964d67cf30ebcbf10327a3777a3"
+            ],
+            "version": "==22.1.0"
         },
         "certifi": {
             "hashes": [
@@ -513,9 +617,6 @@
             "version": "==2.17"
         },
         "coverage": {
-            "extras": [
-                "toml"
-            ],
             "hashes": [
                 "sha256:0147f7833c41927d84f5af9219d9b32f875c0689e5e74ac8ca3cb61e73a698f9",
                 "sha256:04a92a6cf9afd99f9979c61348ec79725a9f9342fb45e63c889e33c04610d97b",
@@ -587,33 +688,36 @@
         },
         "epicscorelibs": {
             "hashes": [
-                "sha256:04d5118bef5d811fd7edfb07e932b16ffb119b099aa9c438f0796f8c43fde870",
-                "sha256:15877ff982ded4f18bce10df603f0c8d92a1721028e53af69d06c14f1b55437c",
-                "sha256:18bc2cea2c532337afc9ba1cd4c029dcbe89e025dea064f3fcff8fc3c2980800",
-                "sha256:1aae34eab3634f1e7ca5c95a3f54f92491381dbc54d426ba704412be998b9ea4",
-                "sha256:1db0a62b83dc5ac94b3593f86248c5532277bc48247c9f5112cf199aafe920d1",
-                "sha256:1e36e8de2abe67c23ff8fcb41912468847f7e4785969b42ef1075f697295c0be",
-                "sha256:27ece87b4fabd04e536dbbf083461274ed61e2d132307526ca3cca4a98359b88",
-                "sha256:2aea6ad97b7772f11f94ba7446ad860f4cdd1146cf30e0950ef34f0d6134baab",
-                "sha256:317dfa567eece806eecefeafe2a7eb6ac90db4f216f39763c39854959ff4e72c",
-                "sha256:43d4d7701a0bada7ed921ec3c6af069ea02137b55268252ebca49207a7ef6351",
-                "sha256:4906fbaa76f89dee3d51b051a78fbd4bf12b80cdee4543d741a63b9999add120",
-                "sha256:49763288bc8fadf7807c8ab19ed0e19795287205537ba463c214c5d0c15b25e3",
-                "sha256:511fad578f2eddbf9fe163666d2171081fe1785440633eba311f2d531a544de4",
-                "sha256:521b05a72b66955bc80a19c8c0e96e1daa12cf5b68b340e40d7cf49dd34b6a92",
-                "sha256:54d4aa0d367e6a639aaa787a4468a33fe359d1dd62bcd10aef7c1e8afc8bd4eb",
-                "sha256:79a68c491e79984b7b966325686f43d9a1e59ebfb593debedb110ed49735e0e0",
-                "sha256:7c53db21b5809be7fb6b6f93187103ab200d2a41a0851e7e827fcdb6b7f699b3",
-                "sha256:8071e1866b57ff6e2579e74dcc53af87421c98bad4684501f526afefc14b7358",
-                "sha256:874fee009d4a392d4e6fd6e550b8d43ab63ad303c78b3d000267a34c33da4f76",
-                "sha256:8f803ceaec535741fcd7ff7adccf8dfbca4ca5aeef60e85a0f36f36d16e57fb3",
-                "sha256:cc4e4158e4ebc288b9d3890c6f8cb14fec38f40bd8ce3f239d9a9e566890d131",
-                "sha256:cf638d6ccb0cbc82f14c8ed4d0c56f55317ebc5b272a6dec0fbf51e76dfad552",
-                "sha256:e3d3733e2c433d599a71c9784ff1fdc031fddaeb8e8c3a7d094064b46252f9dd",
-                "sha256:e45621fd3c9bc46e820835594213313e71f636966c3f2832f031ca7d5466c681",
-                "sha256:e571e90306b8a8248c182763e94d1a8f17573288f5e61ac6aad35da7597404c4"
-            ],
-            "version": "==7.0.6.99.1.0"
+                "sha256:01d45ae25d844afe71893838f36ea649ccc3e1e72a96076b33242437efb1ce13",
+                "sha256:0269ba469aa8117d86e865b09e9f3b3afdb891f5f544a90d8af037039015b995",
+                "sha256:1c6f00360ab2e89081c031ff499f5695bd687102a561160cf6304b64cf325ca5",
+                "sha256:1cbed1cb9b7fa3744723dfb78a1aaa7ff9d475e9dee6e6e21ebb1e682421cd35",
+                "sha256:223515de1da16fd7a06892e41a1e5bc870b57bbf1a0a4ac3dc3e069b647d7313",
+                "sha256:329179971288722eb7f7d085fced198ff30468cc225d9677f08175074680b4ef",
+                "sha256:32f91502afa9639fe576fa5bfa137352ee04f929d2887a2c7c169c24c0658808",
+                "sha256:3c8958b7c3385dc190948af429a7c10d18e71142d749776250341e1db6b3d05b",
+                "sha256:3eb16a21760110e0d159e7ee0f97a36250a83abc0ca6ec08806d4ad148c48761",
+                "sha256:3f07babd8ff1c7499cbe9f95dd80a8cbee45f9f38bda2f6c72855c4c647d2dc7",
+                "sha256:5766a0dafcd02af7ecead064d5502282eac1c66afdddf7235ae822228eedac11",
+                "sha256:5a18ab11d8a565b9ea9e035218b5ac44b86d21162d7260ecb54fad43f506d70f",
+                "sha256:64dd24d80b8dd1bca73ce8ffe0673306cf7018dba61883bd1b7b4ff179ac0623",
+                "sha256:773d51ade8a9c44333a56aae1224afe4c238750643c5a05a461186d9ce7f4cf6",
+                "sha256:86921315b855993c0316eb938586c8b99acc21ba5ed26ac0cb66d32e1682f89b",
+                "sha256:941643c2e90665305deddc4a7fe99dceb5488c80d1c31bd4a96169a92adea73f",
+                "sha256:9a4b401e22a96b9cacc2429f67179fed4a1414e5629f78865d6c63d92ec19439",
+                "sha256:9be6cf03ad466812cd659fa2a6af1c8efd33946abdf0a2c5f8901df2289f2dda",
+                "sha256:a9e07998cca913e6cf5f448c37dc1c2f29acc5fec4aca19ed80cd127b65e5d69",
+                "sha256:ac260dbd4b28a53c8ebac4f902d03448432b46d3fff7809488a63263b7efbd05",
+                "sha256:b0d606a0c0c020387136b1b19091d661b1b2f5763377d6a0b13152351f42ad53",
+                "sha256:b64b38b4f48601054a7bd0423d1559c1a2281cb962fd4cd4c1088f49ac29b2b7",
+                "sha256:b69e91fe38f818a71fd4fbf22ac17d577bdce914d4940883586e57d629030328",
+                "sha256:c3deebf918866f5bdd4fbc5f52b1c89c96121619573698442876eecdf1f9a985",
+                "sha256:cbb5a14534e68eb2a10904ba020191c858860f2dfebbdff969d160a29020724e",
+                "sha256:d729c35c29681acc3b666e59f041e6bd228c931b8303507bb046e331e5f11f67",
+                "sha256:f165e4754249ee12bd38ba68ed72dc27764b28a02654c224c690f68b95519455",
+                "sha256:f40ae0290be4d84c560f848f4b0340b3c9ff466bd52fcbd11899199fa0be9b4b"
+            ],
+            "version": "==7.0.6.99.2.0"
         },
         "filelock": {
             "hashes": [
@@ -868,6 +972,13 @@
             ],
             "version": "==1.3.7"
         },
+        "nose2": {
+            "hashes": [
+                "sha256:6d208d7d6ec9f9d55c74dac81c9394bc3906dbef81a8ca5420b2b9b7f8e69de9",
+                "sha256:d37e75e3010bb4739fe6045a29d4c633ac3146cb5704ee4e4a9e4abeceb2dee3"
+            ],
+            "version": "==0.11.0"
+        },
         "numpy": {
             "hashes": [
                 "sha256:00c9fa73a6989895b8815d98300a20ac993c49ac36c8277e8ffeaa3631c0dbbb",
@@ -905,33 +1016,36 @@
         },
         "p4p": {
             "hashes": [
-                "sha256:0143a3a3d29bf03f7c828c28d025db81961e9933c750bd9d3d8e8b59cb8b71a3",
-                "sha256:160aa3dd5ca55583e929bcc939e0479dfca655fba440dc9b931373e733848959",
-                "sha256:1c688e35e30294c79bfebbda8c460ffb5486cdb64ccbeae93060e6de667942a4",
-                "sha256:1d58c9149b85e0fd19e00167fb047a04c1e649d394cf8fdcb7a172be73de3f6d",
-                "sha256:25e98f73ae4cebc3c305f2b11b0e6689d002594fda9330bf99c6414d0a01753f",
-                "sha256:2b4e193737cb69a20fbed2f86360275ce5dcce5ca83439e1f98b3af5f1aed1cc",
-                "sha256:30d0e083b5dfecee7693d197125daac3e5da9466e50dea0d01d5356abf5c6143",
-                "sha256:34ab524b4ce32dc67ef33421db644d6713ed677f601cbbef7007957f9cb6eb9c",
-                "sha256:3e257761347bf14e66f7a07bb4fda803c1293c3ca8b26baf5818ad66e2d46abb",
-                "sha256:3ec002d4e04ea5c99b33840f71c1042c33d4b13b20e32980b7a0a7eb71195ec4",
-                "sha256:79bd0bcb586d043a3565238be2f002ddf125bb710b4a46b330632a706d36ba08",
-                "sha256:7a004c518ba6abbb4ff96647e5ced0e1329d965448cbdc23709a8b6a3d040b26",
-                "sha256:977dc659a16481603716c655b7cae406e79d7788bd387b64994c198d3a27e19f",
-                "sha256:99c9dc61af4e8323bb77418d0c868717a838d424081156ac31b95957965f901f",
-                "sha256:a922287fd85973bbc900f629f5d475fe9be37eb2d3929fe81405c3ebcd950807",
-                "sha256:bf58b00da603378027cb1af265d0d0ccfa40cdc02263bdebbb4f56837d809512",
-                "sha256:c20592bb15a087add723d84484d95a9e428045a20afc7a791ccdad3e48113a39",
-                "sha256:c46c615896fa0daea5a5942c4b7b51be2bf3f8dfdcc2c05e256f2c957e3353eb",
-                "sha256:c745d18146bf48762806d724b8f265c046196ddb0a1dd15c7aee0919362cbb63",
-                "sha256:c9d5769c31b2700ece9c04aa8c0fc2efe95af8d473b35307d03210ff31d28831",
-                "sha256:cfd500cfa8d3f227704e8f4ff6bafee66bc5459fc56ece7792c334b92be2d35a",
-                "sha256:dda7008629e8232a372b798197dcebc5583eadc0ed643568543ee4afd0387928",
-                "sha256:f014907d2fd51ce132a29b1e869ea4058ead0cc14bcc2ed1690a08752c72ba62",
-                "sha256:f4677018469c7b98434dd465f1210f2ebd13a23d7084187666393a45b2ff7f26",
-                "sha256:f4ce7f6dd0e45f1acc05e0a633b3e18045b576c43394790719dcafb71a5daa13"
-            ],
-            "version": "==3.5.4"
+                "sha256:0120476428d216440c3b30f3463158686c5a2bd1c08a74b2c01218f6c6208f4e",
+                "sha256:097dd63fba31ea1e4474c11bc2c13f4a84220beb58126692caea21c1b15dd589",
+                "sha256:19b3438068f14d77c92286652ba8e62afe61e98d620ccbab44e732118ec5216d",
+                "sha256:1a7f7a49a68d55efe625cef0f4fec761e0c5be45d438ee6e3bf58047792a8006",
+                "sha256:2a98916ce5e856717a6133f3a56863ab288ba4016e3e5c032f924810b09aa238",
+                "sha256:311995b3cdfc1c80498de752a914b7e97a3264753d463dbf3fa9724d9cf32dde",
+                "sha256:38bf3b861e67fa751a8f914f01f6729c09d960d2e2bc1d449f39fc5d7c563d0e",
+                "sha256:3c151edd6d8f68451be8b92326bc20f81fecf7025ecb703ef57d655ed77ea749",
+                "sha256:44764e0334469733775ceb06e0e9ed7784d81b6ae43278176cb249de72237495",
+                "sha256:46a4bd867e7543205663ad1f703e26566e337877715c5f60059e779061d7517d",
+                "sha256:50b555ec84a2a8377f28e42e6a1873f728398d51a8b6bf2e337e3e24b94338b4",
+                "sha256:60a659208adcb88f7f40f79203414cbc6bca1a4e6c238ea2abd29a02a356d12f",
+                "sha256:6e2a17c4b515d62668cd488895e5631056a25e8809f6bd0308da7bd8d60c7c84",
+                "sha256:721c88449c559c5036fe4099e33e6cb7748848f5d4b7412afc7276eb538859a3",
+                "sha256:8acd9c75c741dcd769c4691e4e89eca1bf17ebac5688efc0fb71749cd6ea5f13",
+                "sha256:92fa5a5b4ae9d2b742324c1c8fbd1c920f13d8aef9519320d6b53cfd0cad1caa",
+                "sha256:99b0bca100df27344266ebf6c3b999dd5305782f861060fc5f58656690735e73",
+                "sha256:a2abd4654101daa0b18e8401beee532498fc767df8931f091c0279da27b62bb5",
+                "sha256:b30cc7efe3dcfdd91379466d1d4794e8a96a1169b62bfc4da7f40e6314d81823",
+                "sha256:b925a6eb334e2059b5f617d3320b513afd917ebc8a62ff0e71f45242cb9dd0af",
+                "sha256:ba5911d010acba269918c782458b7fde3ba97e618b1f6506d2b4521b2d5dd08f",
+                "sha256:bc8d130270de984b4b7951bae79092bf42ff22a30cd7d92c3bddb46133a192f7",
+                "sha256:c81a4beae54b75d9a7ba175503753fa08c7048d365eb41b4ebb1edff3d5563e4",
+                "sha256:cca541c24923e6af27310499d4826cd91fcad9d28566ca69d11394c8d0f23725",
+                "sha256:db7afdb655db989a5b4bf0cfc2b0e7a0049bd4bed0a62c14be45e61e02a06b60",
+                "sha256:e29be7d5c2059d5dd22cd0da8af371215aaebee038f5ffb7d1cc83213c1d9325",
+                "sha256:e55d9e94fc7fbe1c28b33550a00e6e4da68935247e110b2861d049ae89982d71",
+                "sha256:fd5c8af30c523957dd32e874932a7b1af29ae9f2f965775ada5e72f9b7eda5e2"
+            ],
+            "version": "==4.0.0"
         },
         "packaging": {
             "hashes": [
@@ -975,6 +1089,13 @@
             ],
             "version": "==0.7.5"
         },
+        "platformdirs": {
+            "hashes": [
+                "sha256:367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2",
+                "sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"
+            ],
+            "version": "==2.4.0"
+        },
         "plop": {
             "hashes": [
                 "sha256:2b583cc2e34f6bb10832793b87b58eaa555ea31a2c8b62b42fac65411cf90139"
@@ -1009,6 +1130,40 @@
             ],
             "version": "==0.7.0"
         },
+        "pvxslibs": {
+            "hashes": [
+                "sha256:02dfd4e90605ffc66b43f8f7a3a1de35b4bae5b47b4ab4646e2b70a1f7383592",
+                "sha256:04e533703cf4f7f5b7e20ba433b99e215dc784c0c140eb358e1e0e59dcecbd51",
+                "sha256:0dbdccd4149ab1cc28a6a0e314020a95865360d81a8c2e3145a2da40cc67d7c8",
+                "sha256:1c42087745bd7624cecdbce462a001a207c61fe772a50a1536f0640dd0da6239",
+                "sha256:205ddcb94d40fc4f43483d2e879f7bd41d41ace854a9366901ea6b73f6189405",
+                "sha256:27e1f9379de1056d0846696a4cc3c0c216a6ad74e4e7cab3707845a2b7666f2d",
+                "sha256:2bb9b4d1d2b06fe9c20e1c96e584551a408c0e76ce1358fc3788031bbdbb754f",
+                "sha256:31d50f8187e908d7bb0eb9451d1ac3cb12ddb02352faf48f266b2e6d4965ed2c",
+                "sha256:33c99c77613bfcfa9882e2bd946db29a9158c3e4f1a9187bda8aea121aa1ae4c",
+                "sha256:36ecad4ae233510b883fd6367b4801a2c7524e12033999ba619561953fb2f4fe",
+                "sha256:51a6a8fc1cc6ec617296cec3405c74612de04e51589a3cb0e3313cb190e95869",
+                "sha256:5708dadb61fd2acef99aac525154e228c3b666fb5e9fe9fa34416dbc7738d987",
+                "sha256:68b29ed99d280989be84cfc7994405b988020aeeebf6de63a245e1ca305c321f",
+                "sha256:719d6afd7a98752f060169aa6ed7c036af2f7daae9ded11ceb7f94c93f6d4d09",
+                "sha256:7cc9e36a5926fc8badee059ed5d56d851da7c77a23f825494bac0d0ec80c4206",
+                "sha256:7d26553c39580ec653a5b9ef828511a0f409f9d90a4224bb2e6a99abdfce5bfd",
+                "sha256:883b3c03d16152087d4556d8edb9a7efe0888a6e44f4c5606aa801a6f19b47ae",
+                "sha256:99a0047a30145ec69a38deb9c6eb3df8404609751578093238da44d75fe8e3d7",
+                "sha256:a2430d61412b7d5a7e2112f2591e1eee04630b71db2f3023fe269f90868a9050",
+                "sha256:b116fd264e1d6cbf3c5f2ed795c375d9046485e5c76b995f6f10537d814afeb1",
+                "sha256:b8103b6a4d9dfb37b2f5a84e65af7ffe8aa6ca719776a2a59b1df95d73824644",
+                "sha256:bcd25ca806e0393ed9c66e5488b2c63b1a31adf7e2abf6efc7f75f23206d7adc",
+                "sha256:cc145ff7f9971cb65e182e64a76e06941f45942ec135bf5a6dd73f56a9845a86",
+                "sha256:ce732420bc888d235ded1210d03c9ef4e82b5f672c1ed61613e21e9c37d69c88",
+                "sha256:eda32d9ca73348257ad6038b028f7f854c66a18483dd8d0615e6f3e61f34cc75",
+                "sha256:ee51a24fc63e96a649e5bb2cf111414f1fa9be993a3fbbcb64677ef9c09ceee1",
+                "sha256:f29bc3e2efba7f9002e6e180cae88af564ee5e382743f821066c133cd4b5150e",
+                "sha256:f599c70a06b59fd0e18ff3ee77a62788865e4e2583179da86c6f3d1284fc77f3"
+            ],
+            "markers": "python_version >= '2.7'",
+            "version": "==0.2.2"
+        },
         "py": {
             "hashes": [
                 "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3",
@@ -1110,60 +1265,6 @@
             ],
             "version": "==2021.3"
         },
-        "regex": {
-            "hashes": [
-                "sha256:0075fe4e2c2720a685fef0f863edd67740ff78c342cf20b2a79bc19388edf5db",
-                "sha256:0621c90f28d17260b41838b22c81a79ff436141b322960eb49c7b3f91d1cbab6",
-                "sha256:070336382ca92c16c45b4066c4ba9fa83fb0bd13d5553a82e07d344df8d58a84",
-                "sha256:075b0fdbaea81afcac5a39a0d1bb91de887dd0d93bf692a5dd69c430e7fc58cb",
-                "sha256:07e3755e0f070bc31567dfe447a02011bfa8444239b3e9e5cca6773a22133839",
-                "sha256:0ed3465acf8c7c10aa2e0f3d9671da410ead63b38a77283ef464cbb64275df58",
-                "sha256:17e095f7f96a4b9f24b93c2c915f31a5201a6316618d919b0593afb070a5270e",
-                "sha256:1d85ca137756d62c8138c971453cafe64741adad1f6a7e63a22a5a8abdbd19fa",
-                "sha256:20605bfad484e1341b2cbfea0708e4b211d233716604846baa54b94821f487cb",
-                "sha256:23f93e74409c210de4de270d4bf88fb8ab736a7400f74210df63a93728cf70d6",
-                "sha256:2bb7cae741de1aa03e3dd3a7d98c304871eb155921ca1f0d7cc11f5aade913fd",
-                "sha256:2e3ff69ab203b54ce5c480c3ccbe959394ea5beef6bd5ad1785457df7acea92e",
-                "sha256:30fe317332de0e50195665bc61a27d46e903d682f94042c36b3f88cb84bd7958",
-                "sha256:3576e173e7b4f88f683b4de7db0c2af1b209bb48b2bf1c827a6f3564fad59a97",
-                "sha256:35ed5714467fc606551db26f80ee5d6aa1f01185586a7bccd96f179c4b974a11",
-                "sha256:41c66bd6750237a8ed23028a6c9173dc0c92dc24c473e771d3bfb9ee817700c3",
-                "sha256:48b4f4810117a9072a5aa70f7fea5f86fa9efbe9a798312e0a05044bd707cc33",
-                "sha256:4abf35e16f4b639daaf05a2602c1b1d47370e01babf9821306aa138924e3fe92",
-                "sha256:4fba661a4966adbd2c3c08d3caad6822ecb6878f5456588e2475ae23a6e47929",
-                "sha256:5e85dcfc5d0f374955015ae12c08365b565c6f1eaf36dd182476a4d8e5a1cdb7",
-                "sha256:77f9d16f7970791f17ecce7e7f101548314ed1ee2583d4268601f30af3170856",
-                "sha256:7ee36d5113b6506b97f45f2e8447cb9af146e60e3f527d93013d19f6d0405f3b",
-                "sha256:7fab29411d75c2eb48070020a40f80255936d7c31357b086e5931c107d48306e",
-                "sha256:85289c25f658e3260b00178757c87f033f3d4b3e40aa4abdd4dc875ff11a94fb",
-                "sha256:886f459db10c0f9d17c87d6594e77be915f18d343ee138e68d259eb385f044a8",
-                "sha256:897c539f0f3b2c3a715be651322bef2167de1cdc276b3f370ae81a3bda62df71",
-                "sha256:8fbe1768feafd3d0156556677b8ff234c7bf94a8110e906b2d73506f577a3269",
-                "sha256:9267e4fba27e6dd1008c4f2983cc548c98b4be4444e3e342db11296c0f45512f",
-                "sha256:9486ebda015913909bc28763c6b92fcc3b5e5a67dee4674bceed112109f5dfb8",
-                "sha256:956187ff49db7014ceb31e88fcacf4cf63371e6e44d209cf8816cd4a2d61e11a",
-                "sha256:a56735c35a3704603d9d7b243ee06139f0837bcac2171d9ba1d638ce1df0742a",
-                "sha256:ab1fea8832976ad0bebb11f652b692c328043057d35e9ebc78ab0a7a30cf9a70",
-                "sha256:adf35d88d9cffc202e6046e4c32e1e11a1d0238b2fcf095c94f109e510ececea",
-                "sha256:af23b9ca9a874ef0ec20e44467b8edd556c37b0f46f93abfa93752ea7c0e8d1e",
-                "sha256:b3794cea825f101fe0df9af8a00f9fad8e119c91e39a28636b95ee2b45b6c2e5",
-                "sha256:bb11c982a849dc22782210b01d0c1b98eb3696ce655d58a54180774e4880ac66",
-                "sha256:be30cd315db0168063a1755fa20a31119da91afa51da2907553493516e165640",
-                "sha256:c6238d30dcff141de076344cf7f52468de61729c2f70d776fce12f55fe8df790",
-                "sha256:cb1e44d860345ab5d4f533b6c37565a22f403277f44c4d2d5e06c325da959883",
-                "sha256:d4bfe3bc3976ccaeb4ae32f51e631964e2f0e85b2b752721b7a02de5ce3b7f27",
-                "sha256:d8ee91e1c295beb5c132ebd78616814de26fedba6aa8687ea460c7f5eb289b72",
-                "sha256:e3c00cb5c71da655e1e5161481455479b613d500dd1bd252aa01df4f037c641f",
-                "sha256:e9cec3a62d146e8e122d159ab93ac32c988e2ec0dcb1e18e9e53ff2da4fbd30c",
-                "sha256:ef4e53e2fdc997d91f5b682f81f7dc9661db9a437acce28745d765d251902d85",
-                "sha256:f0148988af0182a0a4e5020e7c168014f2c55a16d11179610f7883dd48ac0ebe",
-                "sha256:f20f9f430c33597887ba9bd76635476928e76cad2981643ca8be277b8e97aa96",
-                "sha256:f5930d334c2f607711d54761956aedf8137f83f1b764b9640be21d25a976f3a4",
-                "sha256:f6a28e87ba69f3a4f30d775b179aac55be1ce59f55799328a0d9b6df8f16b39d",
-                "sha256:f9ee98d658a146cb6507be720a0ce1b44f2abef8fb43c2859791d91aace17cd5"
-            ],
-            "version": "==2021.11.2"
-        },
         "requests": {
             "hashes": [
                 "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24",
@@ -1416,7 +1517,7 @@
                 "sha256:f8afcf15cc511ada719a88e013cec87c11aff7b91f019295eb4530f96fe5ef2f",
                 "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65"
             ],
-            "markers": "python_version < '3.8' and python_version < '3.8' and implementation_name == 'cpython'",
+            "markers": "python_version < '3.8' and implementation_name == 'cpython' and python_version < '3.8' and implementation_name == 'cpython'",
             "version": "==1.4.3"
         },
         "types-mock": {
@@ -1438,7 +1539,7 @@
                 "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e",
                 "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"
             ],
-            "markers": "python_version < '3.8' and python_version < '3.8'",
+            "markers": "python_version < '3.8' and python_version < '3.10'",
             "version": "==4.0.1"
         },
         "urllib3": {
diff --git a/setup.cfg b/setup.cfg
index 0091aded0..957fd0512 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,7 +35,7 @@ install_requires =
 [options.extras_require]
 # For development tests/docs
 dev = 
-    black==21.5b2
+    black
     flake8-isort
     sphinx>=1.4.9
     sphinx-rtd-theme-github-versions

From 383d41a0526374e883876f4ed7b956faf1086648 Mon Sep 17 00:00:00 2001
From: Benjamin Bradnick <ben.bradnick@diamond.ac.uk>
Date: Thu, 24 Feb 2022 13:21:47 +0000
Subject: [PATCH 2/2] Start fixing PVA server tests

---
 tests/test_modules/test_pva/test_pva_server.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/test_modules/test_pva/test_pva_server.py b/tests/test_modules/test_pva/test_pva_server.py
index b77c869c9..372c1837f 100644
--- a/tests/test_modules/test_pva/test_pva_server.py
+++ b/tests/test_modules/test_pva/test_pva_server.py
@@ -75,7 +75,7 @@
 empty_map_meta_tuple: Tuple[str, str, List] = (
     "S",
     "malcolm:core/MapMeta:1.0",
-    [("elements", ("S", None, [])), ("required", "as")],
+    [("elements", ("S", "structure", [])), ("required", "as")],
 )
 
 empty_method_meta_tuple = (
@@ -83,7 +83,7 @@
     "malcolm:core/MethodMeta:1.1",
     [
         ("takes", empty_map_meta_tuple),
-        ("defaults", ("S", None, [])),
+        ("defaults", ("S", "structure", [])),
         ("description", "s"),
         ("tags", "as"),
         ("writeable", "?"),
@@ -96,7 +96,7 @@
     "S",
     "malcolm:core/MethodLog:1.0",
     [
-        ("value", ("S", None, [])),
+        ("value", ("S", "structure", [])),
         ("present", "as"),
         ("alarm", alarm_tuple),
         ("timeStamp", ts_tuple),
@@ -535,9 +535,9 @@ def testGetEverythingHello(self):
     def testGetSubfield(self):
         counter = self.ctxt.get("TESTCOUNTER", "meta.fields")
         # PvaPy clears the typeid for a substructure
-        self.assertEqual(counter.getID(), "structure")
-        self.assertEqual(len(counter.items()), 1)
-        self.assertEqual(len(counter.meta.items()), 1)
+        self.assertEqual(counter.getID(), "malcolm:core/Block:1.0")
+        self.assertEqual(len(counter.items()), 6)
+        self.assertEqual(len(counter.meta.items()), 5)
         self.assertEqual(len(counter.meta.fields), 5)
         fields_code = dict(counter.meta.type().items())["fields"]
         self.assertEqual(fields_code, "as")
@@ -558,8 +558,8 @@ def testGetBadChannel(self):
     #   pvget TESTCOUNTER.meta -r fields
     def testGetDottedSubfield(self):
         meta = self.ctxt.get("TESTCOUNTER.meta", "fields")
-        self.assertEqual(meta.getID(), "structure")
-        self.assertEqual(len(meta.items()), 1)
+        self.assertEqual(meta.getID(), "malcolm:core/BlockMeta:1.0")
+        self.assertEqual(len(meta.items()), 5)
         self.assertEqual(len(meta.fields), 5)
         fields_code = dict(meta.type().aspy()[2])["fields"]
         self.assertEqual(fields_code, "as")
@@ -670,7 +670,7 @@ def testMonitorSubfieldInitial(self):
         m = self.ctxt.monitor("TESTCOUNTER", q.put, "meta.fields")
         self.addCleanup(m.close)
         counter = q.get(timeout=1)
-        self.assertEqual(counter.getID(), "structure")
+        self.assertEqual(counter.getID(), "malcolm:core/Block:1.0")
         # P4P only says leaves have changed
         self.assertEqual(counter.changedSet(), {"meta.fields"})
         self.assertEqual(