diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 2d407c93..6798f8fe 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -53,17 +53,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - python: [cp37, cp38, cp39, cp310] + os: [ubuntu-latest, windows-latest, macos-13] + python: [cp37, cp38, cp39, cp310, cp311, cp312] - exclude: - # MacOS 14.4.1 for arm64 doesn't support Python < 3.8 - - os: macos-latest - python: "cp37" include: # Put coverage and results files in the project directory for mac - - os: macos-latest + - os: macos-13 cov_file: "{project}/dist/coverage.xml" results_file: "{project}/dist/pytest-results.xml" # And for windows @@ -74,11 +70,6 @@ jobs: - os: ubuntu-latest cov_file: /output/coverage.xml results_file: /output/pytest-results.xml - # MacOS 13 required for Python < 3.8 - - os: macos-13 - python: "cp37" - cov_file: "{project}/dist/coverage.xml" - results_file: "{project}/dist/pytest-results.xml" name: build/${{ matrix.os }}/${{ matrix.python }} runs-on: ${{ matrix.os }} @@ -97,8 +88,7 @@ jobs: python-version: "3.12" - name: Install Python Dependencies - # Pin cibuildwheel due to https://github.com/pypa/cibuildwheel/issues/962 - run: pip install build cibuildwheel>=2.3.1 + run: pip install build cibuildwheel>=2.16.2 - name: Build Wheel run: cibuildwheel --output-dir dist @@ -127,37 +117,13 @@ jobs: name: ${{ matrix.os }}/${{ matrix.python }} directory: dist - - name: Upload Unit Test Results - if: always() - uses: actions/upload-artifact@v4 - with: - name: Unit Test Results (${{ matrix.os }}-${{ matrix.python }}) - path: dist/pytest-results.xml - - publish-test-results: - name: Publish Unit Tests Results - needs: build - runs-on: ubuntu-latest - if: always() - - steps: - - name: Download Artifacts - uses: actions/download-artifact@v4 - with: - path: artifacts - - - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action@v1 - with: - files: artifacts/**/*.xml - test-sdist: needs: [sdist] strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - python: [cp37, cp38, cp39, cp310] + os: [ubuntu-latest, windows-latest, macos-13] + python: [cp37, cp38, cp39, cp310, cp311, cp312] runs-on: ${{ matrix.os }} diff --git a/Pipfile.lock b/Pipfile.lock index ae346b24..28c9cbf2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -41,42 +41,77 @@ }, "epicscorelibs": { "hashes": [ + "sha256:0eb6a4fd030d1c9a36e75305a6c3dbceea8cff0f490a86bd8d3c4a7ff5c1d5a0", "sha256:105eedc19f4e5863851c132725ddcb2c62c16efaa586e98ae711f576cbf01dd6", + "sha256:1094223d472ab74e24040bf98a9a442dcc467022107b4066c4edaf890157373b", "sha256:134712203ca52d72adc2361905bd8ef8ce11cb768b9d6417be87fa6443b1a203", + "sha256:169e42a87407ee2ba537eb625a74c8de9202ee5ad5a7fd99674864fdab09d33f", + "sha256:16bbc893c84b5ca4da50fc6b0dd2cdab58525c0cc159c02cd9170a1b0ebb706f", "sha256:1aca96726e1a653c6eb3eecd26abbf54f854b130e32983b2cfc2bb221e04672e", "sha256:1b5e41510ffe28949dea13fbd72d054776c5740c63b046a0a1d5314e45ef8a4f", "sha256:1fea693b160906535e079afba91a40cec614b3a0f815430838c3bc10b52c6a5c", + "sha256:234f824162d64800f062b776e357f67414e1f199293db5f0bddbfd99042174f2", "sha256:23f4d72d42950f8e24f907e7b47e2d209f869e15696c7cc5b42a90a210df83cc", "sha256:2436a0596ac1066b84aa105a2b713cccdad5134b5e40169107126464d6a0b578", "sha256:283735c6100c3c24ab9a535719b14e48b033b1cc7bb7a9d744c9e847667c8c96", + "sha256:2d0a87c4b6d1ab12634ea0be6c15ec0d021c8befda98b7f5b3da17dbe5027610", "sha256:329d0f3c764677f367206a9eddc06e115e14db9e2377dfe2526df892ea7c53d1", + "sha256:47ecb697a5387fa9a95ade92ae24d41d9db1612b506c1e8eca62af6dd9b7199a", "sha256:4b6b7986f898dfe77fe58b175426a4eb5848a740c0635a47b2dd722b506a8ab5", + "sha256:53e76144672e8c4ab93269acdf3a495cbf9be80b575798f4ec768c8d3be4331a", + "sha256:571edd83866532382cbbf6bc4c3b40ef06cd6f4124c9d804459b4fc6d7720d19", "sha256:5759e3a1bb41d98e6e5c0dff883ec6567c2c5ac898ca0afe1ff1384e09a4bc0f", "sha256:5a4499889df8afc754dfb2b6cfccd3da6f8583ca7e082a5822c93ecd5ba238a1", "sha256:5d450e2840c52f78c5ad3e0d76a83c7d8767ec318c6501d433d8a288ac055d43", "sha256:67647280731c2da102da9fc6ea246b3f5a3632cf7cd236332658c50da054889c", + "sha256:69ace201a89ecfdfdcccc1e82a3cb3688fb914f4de0fb81f351d7fda4a0f0918", + "sha256:6bbf8c92240432aa8e82a04a2b26475744663b9c590289a92b59ee925dc58808", + "sha256:6c4765c5cb12b8befd219559728724da5c92b3d9b6f3251013190526c9798fa3", + "sha256:732058c29b94121a4fc6605edd3f93379228bccbc55a811dfa12c2254e64879a", "sha256:74506531a3690e6d7cc3ce7ec1a1b2e96e67b8e5578a0aeed3667ab50733264b", "sha256:7d8b606889bde4f586ad33e3448097f935833d3bf4a4e54e2111ff8fd58aaa76", + "sha256:831e6abfe8602ba9cfe7f60d2238b6763fb16037c82f3282122a31ef692ce512", + "sha256:840115fac91537cf50d375b60df01e6651e020f35923e03160ca4ff70f9e47cd", + "sha256:8b0402ec8441a216f02c7a36cb711dd63b48498e025a29d24ca3fb4932574457", + "sha256:9999190f514f0348f8054eff8284709670a9cf57324ee192ac0300acdc46f117", + "sha256:9cc415a727164b6417c0bf162f2089f9b202356cee208b5e72ea2cf41730a5d3", + "sha256:a043fb10edad6396d8dd6aaf85f311806e282cafdfdac34bacc273247f4d236b", + "sha256:a25ac3b052f3cdc5b961d75cd1d6f39af903a320d0796325361a572c70eeaa13", + "sha256:a45bf85498d7781b70d9a1f56e5121b88fcb53583862dc52e18aa4f8cf4c6378", "sha256:a80342206e08a975a5ab5fd3be897fbe046e106b83327bc842a42a9f83745876", + "sha256:aa5019266b0cbf840b63212302c3613bcd0644dba8d0f14ff0afd14c45452a02", + "sha256:ab1cbc776f926499e89982f0c5cc3e2560010ece9aef19236d6aba93a632991e", "sha256:ab76f83f6d15e043b8aa4a70e98caea609190ff58d357f3051d15b3eb22258a2", "sha256:afaf784a378a14999c5c72c5e52c672630ed3d0f007e217e272480805849dc70", + "sha256:b939265c033c8a25c8c69b532b2c0253f8781a6bde5ab18815604382a8e23536", + "sha256:ba258fff9d0f57ea6d3c9735eeabea77058b0f61ab17c886fe8d8e8a1368e877", + "sha256:bb10204daa2a74f78c37728ea890233b9a67fd818c14cf1cdeb9fe880f6b27b5", + "sha256:bed8472ba93e46db34a6c91cd1056ee4ded0ba369c782cdcbf16a5667af1d562", "sha256:bf7f165cc0d49e3e530ef9a8d864d6cc2ab1991c7eaec853f81a01e68b191289", "sha256:c31af9178c006d430be23099e854b445a90f344645af76a05becf4b6e8df3678", + "sha256:c375cc7e22a6110eddc1a4f11783943230edc98fb8ba4a7d7374330564e8b6c1", + "sha256:c3d73724c40f0930d0ba92fd9687d4498e3fa2186afa19fae10ff90e1a8ecbd1", + "sha256:cbbcb3bdb8f007874e0c30c71a6f5741bca30366880b92e8855f28846d348eaa", "sha256:d3b379571ef04c65740a3594f842c640674e99eaa00a99c7531f07060d988879", "sha256:d47d3f53da825bc95e1518d0c3b08e60cf01b33b2130c6fa3a82770de3894ef7", + "sha256:d77d3514c480310a9432370c2dd8d8fce35e08a053d5b37de935262252b85d6f", "sha256:e8cbed5c912810bc19c3ebbddd987b8def23845f91eb3b43fc1ee94f5634d84b", "sha256:eb09da32bc39b0befa65ec3bde6f7016af90bed41ccf003bb2bb48c73a312d2d", "sha256:ed138a7257a06eddda2c673be6709aff22c1a71588dfa61d7a5cfb67f3c73fdd", "sha256:ee45f3abddc36bb4317904255914ea6075eafe72b6b9baa67dd179129e076099", "sha256:eec0e18b35f5cd8b472b6d8d7cc74dde81e6d8b06080a1320888a955bf276b5a", + "sha256:eecabf0bd79278472069c52060b7ed7636f9146f0b4b570663d1e21c3d3e3874", "sha256:f8292ecc8ab8e4873f7cd6fbf21c6d5919ec5560d69394bf979e87cf2cfcc9d3", - "sha256:fbfcae4243cb2ee24a0c3dda801903794cd805befe656626ff24410d9422539d" + "sha256:fbfcae4243cb2ee24a0c3dda801903794cd805befe656626ff24410d9422539d", + "sha256:fd4b41b40f041579af05885dd02cda2829999c0a5fd8dc6471afb7114aded120" ], - "version": "==7.0.7.99.0.2" + "version": "==7.0.7.99.1.1a3" }, "epicsdbbuilder": { "hashes": [ + "sha256:32321c0eff5209a1604464a19e30a73429f597efe4df69f1f859758c3a14ebc7", "sha256:40e01ca308b667d17b31dc1907816df20c31b389415268d9ec6e2be6c3b8f283", + "sha256:698ad5882de4a626a82086139ff95204e8de72e63d03d9f22d4418da3a6c8566", "sha256:ae8dc724c72478d2c6a68b08145d027a50af98702d17e4692f2d73f145818e74" ], "version": "==1.5" @@ -119,38 +154,41 @@ }, "pvxslibs": { "hashes": [ - "sha256:0290f0c59b30ccb81bb95ef1758bca767e7b2d33d0616515dedd6d77e229556e", - "sha256:0b93dc8f4f4df56c9695b43c915a8e7e400ff97a6e724a2a14ad62fc9ffeb3e7", - "sha256:0d2655ee3341dce1000977ed005b991609df9e60959f98ae95c3fb863597f540", - "sha256:19ce08ed5be7d13f906da3cc1acfe0e3d1d84eb8c7aa35e9736de7f16085374a", - "sha256:1b0bb350b1ade4c357e66f6f3305a372f4a789e020cb8b2b924867a1c8a23a60", - "sha256:2ba3cf405530b0f12345286f31b3fe406772dfd5032a5b8598855b8793b96be3", - "sha256:3330431d9c87eef3604a41fe5162e52a21125ebf0dd3d6c38e17f6e621ae93d7", - "sha256:389543f604b9530192ac48287b8fa64c97eecf3e36856ac697b34402502fdcdd", - "sha256:4091b9505fdfca177edb857cec741a796a156f81825875bd344c991a1ea53325", - "sha256:5116421b48e544d3f5ea0d2ea844e16c2c39584856408f67140ad624dba56051", - "sha256:524a7692c78a99a87349336e785aa640973cbc6d464ef057919b112e87bce09e", - "sha256:5a00f7071853b878a0c30d2c532e487e6d93fd851c1f7f99e5d57de699232cb3", - "sha256:5b308f70427f47bf8bc54ac80646c5d52aef7156a097094916cefa79c9fc4e42", - "sha256:69cada5cb1a1ef7a9ebd0d3b9c96784049390005fa63aa137bbe6b7cc2391e45", - "sha256:6dfd0b67723019c6dff3d091a2d0b59fba50ef5255452f7f3830c2b88b67e0c4", - "sha256:6e3a54eaee71b4717a59d1339a81c1cbd9eb49a47b37b45618195739f48c142c", - "sha256:7a8d7840bd45a000a6c914ab84f861c7120dec5cb1c017babb15f16fdb7db04e", - "sha256:98564812f0efb7594e796acd79ea010a05e08ae01e8ea90039cd61e80b657710", - "sha256:9efd8c874e4c15e8bd962c93c24f9def72de868c466801f47d113bc6680b0e14", - "sha256:9f37b4a185a23fd4faa62103ff66d035f4d8af2a851b3bb5648a32513d4e5ffb", - "sha256:a7d1fa9cafa2609e4c2f8c77c04d02993ab4b11152e2418d82cc8a1193dbd9b5", - "sha256:b5034c0e8069069a54d98bb04d2ecfdb9dba5ad0ba5ab2b9829bd0905a28e982", - "sha256:c53ffb8b17f2c17a69f45ed6f4b3b774b3e309f2ac2c5f5514dc119a176459d2", - "sha256:c7019e5dac7c552747c41d34d39a1bd016d2cc5892f139c37693638436e19b11", - "sha256:cdbc4a4dc6183cafa3ed2dafeec7101bea6a5a592bea1a168bf7ec1018b4b9ce", - "sha256:d7c35e6775a161d0689936bfe54e07de11b6e9b4843a9747137983bdc6e8bd4c", - "sha256:d94e1744f693284bbf3a7c8bf1291e71cd0fefb843b53fd2164ebccae34d2a51", - "sha256:e5445c9bcd6b0f7addfc9500ad98bb86efb4b33b76e9f984bed3142cfa171fa5", - "sha256:f908811a23fd190b02341a197411d24ea767b643ccd48d14bbeae6e47c9a2adf", - "sha256:fa08d2d1f09c40cda091c540f3be0b4c6d064abd0c1bf0b97a3585f6d933551e" - ], - "version": "==1.3.1" + "sha256:03a7016af188373039694d01102c3bd7610093a4ad9ee1aa31431f76989869c2", + "sha256:082f44c0af4e4cb4820aa8d4af8ec007aa19e61236c903f505ae2cae911dfaaa", + "sha256:09e6b5c0a835b613cc563b4f50cfeba9dbe9796870d8e56cac6735d1b8b3fc4e", + "sha256:107a4df2ef52b085617022924b64bdf6633677cfd37d1d1151895e57c685eb7f", + "sha256:15a86a3322e3ef474b2a5c5e20be12656bbfa3d34742d132d8e6b20b4a9edd57", + "sha256:262b218f59c5c0a4f6e03cc65cb77c69d412fce788a286d0d5c000e996bd5a20", + "sha256:301e62db41d0063913dac37894ecb0bc1370deb9885edf3ff73243b02b06ccdc", + "sha256:30eeeb7f49d575aeeaecca15c99cacd4b41319b8d7a45edcf36bcebe6150f1ad", + "sha256:3a70c55e121dea43c6a74673b677395729169a629c8fc1ccee9296d877b6a180", + "sha256:3ea6869dbb785392648bece78d53e8dbbf0490462f9d617f25deda73cf0c0409", + "sha256:50fd36541f79cedd552b565627aa04da38e197640051bec3253608ac84d641fe", + "sha256:591e833e892a7c30b54169823e6e62cc3ade3e26b444ff7765bc74abdcc00fc5", + "sha256:5f91242fee60280edcfabf28cda418197f42fe4049730fefa09d7da86aafd35c", + "sha256:6933dfba3bdf91915146575515f2278a944a8333d420a057d68a88dc5d1dd807", + "sha256:6d0b2f46261c4bf8c6bb7825189ddf6e8a63bf31dce6eaf3499873f964a834db", + "sha256:766ca84994b24c14b72ece75124dacb09fbf40c9033e155fd04207bb149bd443", + "sha256:7a61b1d158038580ab0fcca80107b96d9acfc6e2951883cccc80ac2b3542453b", + "sha256:7d35de52aaa86192cc6852f2072916e375a269ea1c4c80edb33a0b9df65cb3ab", + "sha256:86dee087eab3e2ef6bac7f31f90dcfe217c6e08abcf733ab100352a64600195d", + "sha256:87067cde2acc30b31b00d67f8b51fe124e247dfd91d9b6e3e28f41ac9c364f18", + "sha256:916908d26e5e60449195724cb66c9a8850b875776372a40c629ae134481586e0", + "sha256:94d5552af0fe85346f4fafd1f677290d19ec89e6c9f98e69fe82e6b370dfaae3", + "sha256:a27f2a9a7356a4eebb9dd7b497963a1935855ab529eb68ddacdbc610147dfde0", + "sha256:abf49243a030ef2e62d5cabdd3e223d39ad3eb6f25565c7d5159dab1340c1c0c", + "sha256:c524266970bcb985453bee7d646b3b1cd0507fd58b9618a8bb2542007bbd1a5f", + "sha256:c5b2ff0f289c4cda001b8316f19067b20903b0f2147e2df375547c536c8a9543", + "sha256:c6b86f7ad6d0e8f8d332ba542e1c54554f803af70c0bc91eee633f8192ea8aba", + "sha256:ce1d2b6c7a5d8aafbe7a9e9e6a1e27180c87e0bdd87e46543271233973c8c98c", + "sha256:d322fa7f25e9a92b0d76cb5e1977c90320968102aa8af3e86ca846ed1db84b54", + "sha256:e4bd24bd98920ef1bcc2de3b672fa8a2d22339a1cff1efaa1bf873ded3705f33", + "sha256:e7d79dd67fedd4d1a5925c89316af5fbb6c0337a477db135c64d38986addda79", + "sha256:f9d4645e91725c54ca5741d9066dfab3a47cd454445db574136a35b5771c9439", + "sha256:fbb0e13c1013c7efcfd38d5707624d01824b5a937e6b817ba4e431a27549b515" + ], + "version": "==1.3.2a2" }, "pyyaml": { "hashes": [ @@ -372,42 +410,77 @@ }, "epicscorelibs": { "hashes": [ + "sha256:0eb6a4fd030d1c9a36e75305a6c3dbceea8cff0f490a86bd8d3c4a7ff5c1d5a0", "sha256:105eedc19f4e5863851c132725ddcb2c62c16efaa586e98ae711f576cbf01dd6", + "sha256:1094223d472ab74e24040bf98a9a442dcc467022107b4066c4edaf890157373b", "sha256:134712203ca52d72adc2361905bd8ef8ce11cb768b9d6417be87fa6443b1a203", + "sha256:169e42a87407ee2ba537eb625a74c8de9202ee5ad5a7fd99674864fdab09d33f", + "sha256:16bbc893c84b5ca4da50fc6b0dd2cdab58525c0cc159c02cd9170a1b0ebb706f", "sha256:1aca96726e1a653c6eb3eecd26abbf54f854b130e32983b2cfc2bb221e04672e", "sha256:1b5e41510ffe28949dea13fbd72d054776c5740c63b046a0a1d5314e45ef8a4f", "sha256:1fea693b160906535e079afba91a40cec614b3a0f815430838c3bc10b52c6a5c", + "sha256:234f824162d64800f062b776e357f67414e1f199293db5f0bddbfd99042174f2", "sha256:23f4d72d42950f8e24f907e7b47e2d209f869e15696c7cc5b42a90a210df83cc", "sha256:2436a0596ac1066b84aa105a2b713cccdad5134b5e40169107126464d6a0b578", "sha256:283735c6100c3c24ab9a535719b14e48b033b1cc7bb7a9d744c9e847667c8c96", + "sha256:2d0a87c4b6d1ab12634ea0be6c15ec0d021c8befda98b7f5b3da17dbe5027610", "sha256:329d0f3c764677f367206a9eddc06e115e14db9e2377dfe2526df892ea7c53d1", + "sha256:47ecb697a5387fa9a95ade92ae24d41d9db1612b506c1e8eca62af6dd9b7199a", "sha256:4b6b7986f898dfe77fe58b175426a4eb5848a740c0635a47b2dd722b506a8ab5", + "sha256:53e76144672e8c4ab93269acdf3a495cbf9be80b575798f4ec768c8d3be4331a", + "sha256:571edd83866532382cbbf6bc4c3b40ef06cd6f4124c9d804459b4fc6d7720d19", "sha256:5759e3a1bb41d98e6e5c0dff883ec6567c2c5ac898ca0afe1ff1384e09a4bc0f", "sha256:5a4499889df8afc754dfb2b6cfccd3da6f8583ca7e082a5822c93ecd5ba238a1", "sha256:5d450e2840c52f78c5ad3e0d76a83c7d8767ec318c6501d433d8a288ac055d43", "sha256:67647280731c2da102da9fc6ea246b3f5a3632cf7cd236332658c50da054889c", + "sha256:69ace201a89ecfdfdcccc1e82a3cb3688fb914f4de0fb81f351d7fda4a0f0918", + "sha256:6bbf8c92240432aa8e82a04a2b26475744663b9c590289a92b59ee925dc58808", + "sha256:6c4765c5cb12b8befd219559728724da5c92b3d9b6f3251013190526c9798fa3", + "sha256:732058c29b94121a4fc6605edd3f93379228bccbc55a811dfa12c2254e64879a", "sha256:74506531a3690e6d7cc3ce7ec1a1b2e96e67b8e5578a0aeed3667ab50733264b", "sha256:7d8b606889bde4f586ad33e3448097f935833d3bf4a4e54e2111ff8fd58aaa76", + "sha256:831e6abfe8602ba9cfe7f60d2238b6763fb16037c82f3282122a31ef692ce512", + "sha256:840115fac91537cf50d375b60df01e6651e020f35923e03160ca4ff70f9e47cd", + "sha256:8b0402ec8441a216f02c7a36cb711dd63b48498e025a29d24ca3fb4932574457", + "sha256:9999190f514f0348f8054eff8284709670a9cf57324ee192ac0300acdc46f117", + "sha256:9cc415a727164b6417c0bf162f2089f9b202356cee208b5e72ea2cf41730a5d3", + "sha256:a043fb10edad6396d8dd6aaf85f311806e282cafdfdac34bacc273247f4d236b", + "sha256:a25ac3b052f3cdc5b961d75cd1d6f39af903a320d0796325361a572c70eeaa13", + "sha256:a45bf85498d7781b70d9a1f56e5121b88fcb53583862dc52e18aa4f8cf4c6378", "sha256:a80342206e08a975a5ab5fd3be897fbe046e106b83327bc842a42a9f83745876", + "sha256:aa5019266b0cbf840b63212302c3613bcd0644dba8d0f14ff0afd14c45452a02", + "sha256:ab1cbc776f926499e89982f0c5cc3e2560010ece9aef19236d6aba93a632991e", "sha256:ab76f83f6d15e043b8aa4a70e98caea609190ff58d357f3051d15b3eb22258a2", "sha256:afaf784a378a14999c5c72c5e52c672630ed3d0f007e217e272480805849dc70", + "sha256:b939265c033c8a25c8c69b532b2c0253f8781a6bde5ab18815604382a8e23536", + "sha256:ba258fff9d0f57ea6d3c9735eeabea77058b0f61ab17c886fe8d8e8a1368e877", + "sha256:bb10204daa2a74f78c37728ea890233b9a67fd818c14cf1cdeb9fe880f6b27b5", + "sha256:bed8472ba93e46db34a6c91cd1056ee4ded0ba369c782cdcbf16a5667af1d562", "sha256:bf7f165cc0d49e3e530ef9a8d864d6cc2ab1991c7eaec853f81a01e68b191289", "sha256:c31af9178c006d430be23099e854b445a90f344645af76a05becf4b6e8df3678", + "sha256:c375cc7e22a6110eddc1a4f11783943230edc98fb8ba4a7d7374330564e8b6c1", + "sha256:c3d73724c40f0930d0ba92fd9687d4498e3fa2186afa19fae10ff90e1a8ecbd1", + "sha256:cbbcb3bdb8f007874e0c30c71a6f5741bca30366880b92e8855f28846d348eaa", "sha256:d3b379571ef04c65740a3594f842c640674e99eaa00a99c7531f07060d988879", "sha256:d47d3f53da825bc95e1518d0c3b08e60cf01b33b2130c6fa3a82770de3894ef7", + "sha256:d77d3514c480310a9432370c2dd8d8fce35e08a053d5b37de935262252b85d6f", "sha256:e8cbed5c912810bc19c3ebbddd987b8def23845f91eb3b43fc1ee94f5634d84b", "sha256:eb09da32bc39b0befa65ec3bde6f7016af90bed41ccf003bb2bb48c73a312d2d", "sha256:ed138a7257a06eddda2c673be6709aff22c1a71588dfa61d7a5cfb67f3c73fdd", "sha256:ee45f3abddc36bb4317904255914ea6075eafe72b6b9baa67dd179129e076099", "sha256:eec0e18b35f5cd8b472b6d8d7cc74dde81e6d8b06080a1320888a955bf276b5a", + "sha256:eecabf0bd79278472069c52060b7ed7636f9146f0b4b570663d1e21c3d3e3874", "sha256:f8292ecc8ab8e4873f7cd6fbf21c6d5919ec5560d69394bf979e87cf2cfcc9d3", - "sha256:fbfcae4243cb2ee24a0c3dda801903794cd805befe656626ff24410d9422539d" + "sha256:fbfcae4243cb2ee24a0c3dda801903794cd805befe656626ff24410d9422539d", + "sha256:fd4b41b40f041579af05885dd02cda2829999c0a5fd8dc6471afb7114aded120" ], - "version": "==7.0.7.99.0.2" + "version": "==7.0.7.99.1.1a3" }, "epicsdbbuilder": { "hashes": [ + "sha256:32321c0eff5209a1604464a19e30a73429f597efe4df69f1f859758c3a14ebc7", "sha256:40e01ca308b667d17b31dc1907816df20c31b389415268d9ec6e2be6c3b8f283", + "sha256:698ad5882de4a626a82086139ff95204e8de72e63d03d9f22d4418da3a6c8566", "sha256:ae8dc724c72478d2c6a68b08145d027a50af98702d17e4692f2d73f145818e74" ], "version": "==1.5" @@ -560,69 +633,41 @@ }, "p4p": { "hashes": [ - "sha256:036f1f6cbfce52b0a8572af783187ce2c47eeb300cecab1a17f289de44b2d48c", - "sha256:06bcd97052bd8d2a103a2799ed6eabe5e666441b51d93c93e933cbc716f136e5", - "sha256:0876f1ec9c14cb090ad0b6bb9bcc591087ad70940a61e168f9389d8d8535d802", - "sha256:094d7fb59b6690c176dc5491eaaed3a174be61ad9b51233cf89456e314bfbcf5", - "sha256:0a5fecfd5a5f836c5389f99b82385b50073e785c211777f7c5bb783a959b75dc", - "sha256:0adb9df0ffb50dc9c61068000cc6a4c7f5aa649f288ab4eb908a7f09f7754de7", - "sha256:0bb26613c72db0c1bf22ddecc614595069a3f4e8a376642b8331e194c9538c88", - "sha256:213c4cba41a99db1a54656576f87f3dd711dcc083f9cb1085091de6c71161bcd", - "sha256:264603c5c1635cb499ba7c16095dc171ca2e38a4b98f9c955d9f3507e5b646c1", - "sha256:34467b3ba8e93a422f4a8895c343bd6226c9bd14f3d35b829271fadc265a743c", - "sha256:3f6f25dddf2e04b20d7f5ad5219f1b42fa4eff5f338d9c416b5e09ca2fc8a6d7", - "sha256:43ae3e430b4bb0c2980846d9c81a0259e78439a5cc79bba59bea14e636292e78", - "sha256:4498bf14d44d416f034c8333ab51acf7799c4dfd35320f729d6ec8d941eb2de0", - "sha256:496a813388fc0343af7ab7585d691679655eaba78f2762d6931014791e3de728", - "sha256:4abd1e8c01afb46c18dbd251b4f5085f970c9d84b01953bc8ffa3a4c1e0650c1", - "sha256:4b41c83a6a714bcc5a0aea6943fd01d506dc82e512268aa8cd2c2f408ba527bf", - "sha256:4d8221f66715c3c187c9685441b0815553c4f0c8e7fb30851130bec7645f318d", - "sha256:542fdcb30b43d045113ea48ce4c03006ed898a8f322c4486f0737e66103ce081", - "sha256:57649eb4bfac09b9a2e5b839b9d630b4bb3ee2a4ce655c3101304e08514258cf", - "sha256:5a23b45cac2be75f1d117fb3a36881770c548293af6121cefd0197c34973d9bc", - "sha256:5d9a4003effddac2613ecaddf89fe81720ff1040e79c9fb0ee70ae8cea19c9da", - "sha256:5e7f7472025281d147256803aefa87ef9132db1f97b8279d5344061f377c5c81", - "sha256:60f81ce13481aa19ea136165c794ad765a11bde00cf97308b1d06dccd4d6c291", - "sha256:66609b3ef10ec5255f9c6cf6fd1520550132e70e712244f9d4857ff3c8d95a1c", - "sha256:6d0e394822615a707404acaf5d73ee86638a9300ca55d6ebf15c66a1f8ada835", - "sha256:6e3f4c86c326f2ebc4c30f93bf39087885ce0a385c10c95083689a512e4fa130", - "sha256:734d5758ac4c27926ae65e7c37bf7d6c1ffeeae800bd6a03cac2a99b44646ab9", - "sha256:7ea761215b16783cec228878a3c81fadd0baecead153b5838d45b4e00ce90e92", - "sha256:8215602e636e6192c53a60fb07758f2bd3b3b153c23b8853d5f714deccf25ac7", - "sha256:84414b0e5732e4f71d42aae44984117e11c1447aaf768394cbbcef748aaceb74", - "sha256:8c31b6a2545311f205b7bdbc6ad3053e10c1470bcd0a76dd0bc64e721cc41cb7", - "sha256:8c49b0df4570be474164ff4ff6957a0ac815088feb7aefcad38998c782538f91", - "sha256:8cd4f226ff14afb5b628b38e92db4614ead8109a229acf5119bc76279f5e21bf", - "sha256:8ef0ccac97972e5750251de7306d8ae6f4230a29acbf34dfb95e1eebbff125b5", - "sha256:9568a557bd1c1fb899bdcc8fac88426fa74c031700c9e4bd6f7483dc085ab73b", - "sha256:956bd0fcfb28ff457af43b34ee510cb678ae1a4263fe2477480bf52da8b815e6", - "sha256:960e36ee030cee04974eaa8c431a788bdce6e57fb152a784915cd8a249e1c5fb", - "sha256:962a53b264302c362f8f21c1d9a0867bf8f6f9674fdd5b7f013f5c01dc73e571", - "sha256:96423370f91a6e4c99bbbcecc078641c1070c300f3331970e04662d3d9658582", - "sha256:a0b7b671dc79b4766a5e4258f7c7fbc4aeb4fe79eebdaa8d13314f2837ed5298", - "sha256:a2f1148862a8033d65440b16889659caccdd56d710a0ce4bff327ff3e952479d", - "sha256:a71007e4afbf35869db5c022718f734ae3ae73350a0fb1dc0284b9da2e1db718", - "sha256:ad0fe2984e658c29f40ab482634489e085a47c39ffd3953240d752f669aaa003", - "sha256:b84f7cd7d259dd9ad50a011b296e08af1bdf4d199fbf48dc9d023cd3640e09f6", - "sha256:bba544a92c89894df2245e9a999963a67ee928885f1bbce952691a44ad654f78", - "sha256:bccd5f49e04bf44c07fa0978f27b8f77fb793db92d28b453ea170ef772e9f62c", - "sha256:ca2d9c4a5146d606c9dc3acb84f87eb393bf0096e641b0410cfedcd40149bc3c", - "sha256:d2237ef55eff70e1c70a1035edc9c9bba62237164a7880f72a0e87f612ca710f", - "sha256:d6a6653e90af76b5afe60292aa34f37057bbc2174e31cca859bf3d9e4ab1d3b3", - "sha256:d8af244a0c90289612b612670c558b0fb5b3f88a2e7cb29b7bdbd9d8e9e188e3", - "sha256:e8bb2cf38c229c6fbd464ece734e577c1d178dd4873865898b3de6b99232ca17", - "sha256:ec41c3d9eeb1b5d32b333bf4e3b67ee036a15a97bcdf62d5d258437dcd7c21a5", - "sha256:ef7b31ec7f9cdd19825622907b726e4f47d6b25559b687545b4a53bd91fc87ed", - "sha256:f3c3cc52e46ee91db294dc2f5f1ac1505c80358bb51cc1e98acf394b540bd4b9", - "sha256:f4bc441b19c5a36896b52215a201aa18875f991d658dc0b30edffece3beaf9cb", - "sha256:f5b28ce90f8229f17371a2e6476fd37333c2fb10556a8233b8790eaf821dd704", - "sha256:f5f17627f32380a075095faed54c7e73664dca00e1134fec5311e59b128eba7b", - "sha256:f96e255c89f6426c29856bd0e4b22d2294fa7eec3ece91be05cb8e453bac13eb", - "sha256:fa0ef3c7f9c4df4b739a42e5b2edddffac9f10127bd501f5d29546f26f9016f2", - "sha256:fccf95d33e985e12a04dc2461a56700401ddb76b6851311df5f19419fd951d54", - "sha256:fd8488da5594cc5073ca15bd47da1806ba68f8e4c040e5c917d636921d6cbe8e" - ], - "version": "==4.1.12" + "sha256:07f04dded9e6103c586046c20b578cce82a226e1a04f3bd8c3784d4bea9f0fac", + "sha256:0ce101a3289470523caa110e4e79ebc8daf24d0e785cf96443c6111435b6e633", + "sha256:12672f41bad90efc290b20b13410d535f41d87777f1ca20a10bf9bb8a4927dc1", + "sha256:1729e0f399d72c979b8166826378d52c5fa0b0a89b4b447c016a57f12e4a3c74", + "sha256:2441c7d861d01bd577f6f9d4cea2397b013d53b8e09cae7cfbd12a47c49fc5f6", + "sha256:2bb8914c0bfb7852f98cd6bb9b3b585acecc68673eb2c41fd97159bbffb4cf48", + "sha256:38c912286cdd0626cde87829d96f1f1a952a39db5f00396d80042cc644731882", + "sha256:461702464e048ab3ec837d4cd279bde208018b1dd65bcf00dd0cd00160e7a921", + "sha256:4f130a80cf84b07dd9751e80871d55773abb9879925a92c38494f86c0c6fe87c", + "sha256:5fe25b9f716ef38680b20bd03e08611eb78ad50e1017d2c32dd240797b8abbb6", + "sha256:662d4e59a54710da8857f3740eacb0a59ed36d85a169e3e39a3d1cf3b824c3b9", + "sha256:6787cc0e9b0309336945d1c82ef38c072d7ca90886f5eb61f945a7f5bdd415fe", + "sha256:68a762ff12417833d241b05c0c43568a2aaff3f1542ecd8407b3511aaa84da6a", + "sha256:7a4eca64ac06f7c3b3ec151d0ce66eb88be0a3c31702e54d2648eb4c6ff03ffd", + "sha256:865d9953fa6f3c1f6558e799350cbb24b8304cf4fdc6d92fc112777406e98ae1", + "sha256:966c248f69d6cc5af68831ae8fa151c73498cb02d3e8d943acd5908d235acbe2", + "sha256:9704d7690636d9c70caa3bfc66a443d61a6540ed51df08161ca99c1082f11869", + "sha256:a16958d124c6ca90e66b6183489ac09ae4f266b9566c43b6a2b0cfbbb596a203", + "sha256:b0b8efdcae2d062a7f4a57f4165a0b84b488e17abb2b41999b51b648731eb55e", + "sha256:c277267c8d605e8fbb2a3d1b5d14377042055ba56e11e820823ec31347310ba2", + "sha256:c2b7fefa5a324e42ba18d69e978e710c9ef969968b7d3669c5cae38213eab691", + "sha256:cc0963716e6e81a974813a956624e32115386e341ebb21e6806ed54e7191f0a9", + "sha256:d16e30b27fc8b8da6394ba7cc1f30b526478a3eeb9767e41abc0f4edeb4e4dde", + "sha256:d5aebefbc343a723311ca0ec23177252dc14fac9482d455f5506add4a91e580e", + "sha256:d8e052c994193791c38b1102597124ac8a446f9d06d88cfe5f5b18fb979d6e9f", + "sha256:d9e911f5cee3d0235e47b3529c9e483f939cced5caa1c112d54e4dab7f76ac3f", + "sha256:e45120cf3b902a9095a3ca276fa26f7c6cd21ca4f17e6c3e27a3e30bd6c597e3", + "sha256:e5dd65da826ca61a8c0c27aa888ac78a4d8c4408d815c26d78a3063e03a8fb64", + "sha256:e8558b06aeeeb329e2a4f398c48f9a04c5b5cae89c289e5f3378c40b0b4fe8a0", + "sha256:f6c545e76f63bb71dbacbc05ed9864af3761e965f738b54c8d67f6dff866f1cc", + "sha256:fb5c1d5ff0c8a0cde27469616edabb1b6ec89c32a89ffe3e319a17b08e1fd66d", + "sha256:feddd9bc6962ce5544d3fa3d1ff89d58accdffdb3b7a62132084eee06c82003c" + ], + "markers": "python_version >= '2.7'", + "version": "==4.2.0a3" }, "packaging": { "hashes": [ @@ -647,38 +692,41 @@ }, "pvxslibs": { "hashes": [ - "sha256:0290f0c59b30ccb81bb95ef1758bca767e7b2d33d0616515dedd6d77e229556e", - "sha256:0b93dc8f4f4df56c9695b43c915a8e7e400ff97a6e724a2a14ad62fc9ffeb3e7", - "sha256:0d2655ee3341dce1000977ed005b991609df9e60959f98ae95c3fb863597f540", - "sha256:19ce08ed5be7d13f906da3cc1acfe0e3d1d84eb8c7aa35e9736de7f16085374a", - "sha256:1b0bb350b1ade4c357e66f6f3305a372f4a789e020cb8b2b924867a1c8a23a60", - "sha256:2ba3cf405530b0f12345286f31b3fe406772dfd5032a5b8598855b8793b96be3", - "sha256:3330431d9c87eef3604a41fe5162e52a21125ebf0dd3d6c38e17f6e621ae93d7", - "sha256:389543f604b9530192ac48287b8fa64c97eecf3e36856ac697b34402502fdcdd", - "sha256:4091b9505fdfca177edb857cec741a796a156f81825875bd344c991a1ea53325", - "sha256:5116421b48e544d3f5ea0d2ea844e16c2c39584856408f67140ad624dba56051", - "sha256:524a7692c78a99a87349336e785aa640973cbc6d464ef057919b112e87bce09e", - "sha256:5a00f7071853b878a0c30d2c532e487e6d93fd851c1f7f99e5d57de699232cb3", - "sha256:5b308f70427f47bf8bc54ac80646c5d52aef7156a097094916cefa79c9fc4e42", - "sha256:69cada5cb1a1ef7a9ebd0d3b9c96784049390005fa63aa137bbe6b7cc2391e45", - "sha256:6dfd0b67723019c6dff3d091a2d0b59fba50ef5255452f7f3830c2b88b67e0c4", - "sha256:6e3a54eaee71b4717a59d1339a81c1cbd9eb49a47b37b45618195739f48c142c", - "sha256:7a8d7840bd45a000a6c914ab84f861c7120dec5cb1c017babb15f16fdb7db04e", - "sha256:98564812f0efb7594e796acd79ea010a05e08ae01e8ea90039cd61e80b657710", - "sha256:9efd8c874e4c15e8bd962c93c24f9def72de868c466801f47d113bc6680b0e14", - "sha256:9f37b4a185a23fd4faa62103ff66d035f4d8af2a851b3bb5648a32513d4e5ffb", - "sha256:a7d1fa9cafa2609e4c2f8c77c04d02993ab4b11152e2418d82cc8a1193dbd9b5", - "sha256:b5034c0e8069069a54d98bb04d2ecfdb9dba5ad0ba5ab2b9829bd0905a28e982", - "sha256:c53ffb8b17f2c17a69f45ed6f4b3b774b3e309f2ac2c5f5514dc119a176459d2", - "sha256:c7019e5dac7c552747c41d34d39a1bd016d2cc5892f139c37693638436e19b11", - "sha256:cdbc4a4dc6183cafa3ed2dafeec7101bea6a5a592bea1a168bf7ec1018b4b9ce", - "sha256:d7c35e6775a161d0689936bfe54e07de11b6e9b4843a9747137983bdc6e8bd4c", - "sha256:d94e1744f693284bbf3a7c8bf1291e71cd0fefb843b53fd2164ebccae34d2a51", - "sha256:e5445c9bcd6b0f7addfc9500ad98bb86efb4b33b76e9f984bed3142cfa171fa5", - "sha256:f908811a23fd190b02341a197411d24ea767b643ccd48d14bbeae6e47c9a2adf", - "sha256:fa08d2d1f09c40cda091c540f3be0b4c6d064abd0c1bf0b97a3585f6d933551e" - ], - "version": "==1.3.1" + "sha256:03a7016af188373039694d01102c3bd7610093a4ad9ee1aa31431f76989869c2", + "sha256:082f44c0af4e4cb4820aa8d4af8ec007aa19e61236c903f505ae2cae911dfaaa", + "sha256:09e6b5c0a835b613cc563b4f50cfeba9dbe9796870d8e56cac6735d1b8b3fc4e", + "sha256:107a4df2ef52b085617022924b64bdf6633677cfd37d1d1151895e57c685eb7f", + "sha256:15a86a3322e3ef474b2a5c5e20be12656bbfa3d34742d132d8e6b20b4a9edd57", + "sha256:262b218f59c5c0a4f6e03cc65cb77c69d412fce788a286d0d5c000e996bd5a20", + "sha256:301e62db41d0063913dac37894ecb0bc1370deb9885edf3ff73243b02b06ccdc", + "sha256:30eeeb7f49d575aeeaecca15c99cacd4b41319b8d7a45edcf36bcebe6150f1ad", + "sha256:3a70c55e121dea43c6a74673b677395729169a629c8fc1ccee9296d877b6a180", + "sha256:3ea6869dbb785392648bece78d53e8dbbf0490462f9d617f25deda73cf0c0409", + "sha256:50fd36541f79cedd552b565627aa04da38e197640051bec3253608ac84d641fe", + "sha256:591e833e892a7c30b54169823e6e62cc3ade3e26b444ff7765bc74abdcc00fc5", + "sha256:5f91242fee60280edcfabf28cda418197f42fe4049730fefa09d7da86aafd35c", + "sha256:6933dfba3bdf91915146575515f2278a944a8333d420a057d68a88dc5d1dd807", + "sha256:6d0b2f46261c4bf8c6bb7825189ddf6e8a63bf31dce6eaf3499873f964a834db", + "sha256:766ca84994b24c14b72ece75124dacb09fbf40c9033e155fd04207bb149bd443", + "sha256:7a61b1d158038580ab0fcca80107b96d9acfc6e2951883cccc80ac2b3542453b", + "sha256:7d35de52aaa86192cc6852f2072916e375a269ea1c4c80edb33a0b9df65cb3ab", + "sha256:86dee087eab3e2ef6bac7f31f90dcfe217c6e08abcf733ab100352a64600195d", + "sha256:87067cde2acc30b31b00d67f8b51fe124e247dfd91d9b6e3e28f41ac9c364f18", + "sha256:916908d26e5e60449195724cb66c9a8850b875776372a40c629ae134481586e0", + "sha256:94d5552af0fe85346f4fafd1f677290d19ec89e6c9f98e69fe82e6b370dfaae3", + "sha256:a27f2a9a7356a4eebb9dd7b497963a1935855ab529eb68ddacdbc610147dfde0", + "sha256:abf49243a030ef2e62d5cabdd3e223d39ad3eb6f25565c7d5159dab1340c1c0c", + "sha256:c524266970bcb985453bee7d646b3b1cd0507fd58b9618a8bb2542007bbd1a5f", + "sha256:c5b2ff0f289c4cda001b8316f19067b20903b0f2147e2df375547c536c8a9543", + "sha256:c6b86f7ad6d0e8f8d332ba542e1c54554f803af70c0bc91eee633f8192ea8aba", + "sha256:ce1d2b6c7a5d8aafbe7a9e9e6a1e27180c87e0bdd87e46543271233973c8c98c", + "sha256:d322fa7f25e9a92b0d76cb5e1977c90320968102aa8af3e86ca846ed1db84b54", + "sha256:e4bd24bd98920ef1bcc2de3b672fa8a2d22339a1cff1efaa1bf873ded3705f33", + "sha256:e7d79dd67fedd4d1a5925c89316af5fbb6c0337a477db135c64d38986addda79", + "sha256:f9d4645e91725c54ca5741d9066dfab3a47cd454445db574136a35b5771c9439", + "sha256:fbb0e13c1013c7efcfd38d5707624d01824b5a937e6b817ba4e431a27549b515" + ], + "version": "==1.3.2a2" }, "pycodestyle": { "hashes": [ @@ -826,7 +874,8 @@ "sphinx-rtd-theme-github-versions": { "hashes": [ "sha256:0df27ae9a9cd902468c808dbee5a43f4db8ce43cbcf2ecc78d2fe47698bb0ded", - "sha256:23018e51a5d27ef4f69dd86314f73b19088f2cfd91c74a24db1517832233dc07" + "sha256:23018e51a5d27ef4f69dd86314f73b19088f2cfd91c74a24db1517832233dc07", + "sha256:7f67ba75cac8ddd51326f0b2f314bf653e72b4c96a5adc6e779acc8c01da81ab" ], "version": "==1.1" }, diff --git a/pyproject.toml b/pyproject.toml index 325848e3..f83a3dc9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools", "wheel", "setuptools_dso>=2.1", "epicscorelibs>=7.0.7.99.0.2"] +requires = ["setuptools", "wheel", "setuptools_dso>=2.1", "epicscorelibs>=7.0.7.99.1.1a3"] build-backend = "setuptools.build_meta:__legacy__" diff --git a/setup.cfg b/setup.cfg index ea254e4b..aa771e1d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -52,11 +52,12 @@ dev = flake8 <5.0.0 # Higher version of sphinx require importlib-metadata version that conflicts with other packages sphinx ==4.3.2 - sphinx-rtd-theme-github-versions + sphinx-rtd-theme ==1.0.0 + sphinx-rtd-theme-github-versions ==1.1 pytest-asyncio aioca >=1.6 cothread; sys_platform != "win32" - p4p>=4.1.11 + p4p>=4.2.0a2 [flake8] max-line-length = 80 diff --git a/setup.py b/setup.py index 117387ab..97211b16 100644 --- a/setup.py +++ b/setup.py @@ -104,8 +104,8 @@ def install_for_development(self): install_requires = [ # Dependency version declared in pyproject.toml epicscorelibs.version.abi_requires(), - "pvxslibs>=1.2.4", - "numpy<2.0", + "pvxslibs>=1.3.2a2", + "numpy", "epicsdbbuilder>=1.4", "pyyaml>=6.0" ], diff --git a/tests/conftest.py b/tests/conftest.py index 66ab41ee..5eb86769 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -42,7 +42,7 @@ def create_random_prefix(): return "".join(random.choice(string.ascii_uppercase) for _ in range(12)) # Can't use logging as it's not multiprocess safe, and -# alteratives are overkill +# alternatives are overkill def log(*args): print(datetime.now().strftime("%H:%M:%S"), *args) diff --git a/tests/sim_cothread_ioc.py b/tests/sim_cothread_ioc.py index a49c13c6..e7e67336 100644 --- a/tests/sim_cothread_ioc.py +++ b/tests/sim_cothread_ioc.py @@ -4,9 +4,10 @@ from softioc import softioc, builder, pvlog -from conftest import ADDRESS, select_and_recv +from conftest import ADDRESS, log, select_and_recv if __name__ == "__main__": + log("sim_cothread_ioc starting") with Client(ADDRESS) as conn: import cothread @@ -18,16 +19,24 @@ import sim_records + log("sim_cothread_ioc records created") + # Run the IOC builder.LoadDatabase() softioc.iocInit() + log("sim_cothread_ioc ready") + conn.send("R") # "Ready" + log("sim_cothread_ioc waiting for Done") + select_and_recv(conn, "D") # "Done" # Attempt to ensure all buffers flushed - C code (from `import pvlog`) # may not be affected by these calls... sys.stdout.flush() sys.stderr.flush() + log("sim_cothread_ioc sending Done") + conn.send("D") # "Ready" diff --git a/tests/test_cothread.py b/tests/test_cothread.py index 51cb9d20..3586c9ca 100644 --- a/tests/test_cothread.py +++ b/tests/test_cothread.py @@ -2,7 +2,7 @@ from multiprocessing.connection import Listener -from conftest import requires_cothread, ADDRESS, select_and_recv +from conftest import requires_cothread, ADDRESS, log, select_and_recv @requires_cothread def test_cothread_ioc(cothread_ioc): @@ -12,8 +12,9 @@ def test_cothread_ioc(cothread_ioc): pre = cothread_ioc.pv_prefix with Listener(ADDRESS) as listener, listener.accept() as conn: - + log("test_cothread_ioc wait for Ready") select_and_recv(conn, "R") # "Ready" + log("test_cothread_ioc Ready received") # Start assert caget(pre + ":UPTIME").startswith("00:00:0") @@ -31,9 +32,12 @@ def test_cothread_ioc(cothread_ioc): with Context("pva") as ctx: assert ctx.get(pre + ":STRINGOUT") == "something" + log("test_cothread_ioc sending Done") conn.send("D") # "Done" + log("test_cothread_ioc waiting for Done") select_and_recv(conn, "D") # "Done" + log("test_cothread_ioc received Done") # Stop cothread_ioc.proc.send_signal(signal.SIGINT)