Remove dependency on p4p fork #21
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently there are two reasons we are dependent on our p4p fork.
In both cases I have followed the same strategy to resolve the problem. I have created p4p_ext equivalents for the modules and then used monkey patching to implement the small necessary changes to merge the PRs into the p4p library code.
This means that to use the patched code you use
p4p_ext.server.thread.SharedPVorp4p_ext.nt.NTENuminstead ofp4p.server.thread.SharedPVorp4p.nt.NTEnumrespectively. The p4p_ext code has been patched to use the monkey patched versions. In the case ofp4p_ext.nt.NTENumit should automatically disable itself at the next version increment ofp4p.version.I have also modified the
pyproject.yamland builds so that they now use plain p4p.