Skip to content

Commit dcccdd6

Browse files
Merge pull request #172 from DiamondLightSource/fix_p4p_test
Fix p4p tests
2 parents b377967 + df8bbbe commit dcccdd6

File tree

3 files changed

+105
-75
lines changed

3 files changed

+105
-75
lines changed

Pipfile.lock

Lines changed: 102 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ dev =
5656
pytest-asyncio
5757
aioca >=1.6
5858
cothread; sys_platform != "win32"
59-
p4p
59+
p4p>=4.1.11
6060

6161
[flake8]
6262
max-line-length = 80

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ def install_for_development(self):
104104
install_requires = [
105105
# Dependency version declared in pyproject.toml
106106
epicscorelibs.version.abi_requires(),
107-
"pvxslibs>=1.2.2",
108-
"numpy",
107+
"pvxslibs>=1.2.4",
108+
"numpy<2.0",
109109
"epicsdbbuilder>=1.4"
110110
],
111111
zip_safe = False, # setuptools_dso is not compatible with eggs!

0 commit comments

Comments
 (0)