Skip to content

Commit

Permalink
MNT: stop install wrong pyca package through pip
Browse files Browse the repository at this point in the history
The correct package is on github: https://github.com/slaclab/pyca
and on coda: https://anaconda.org/conda-forge/pyca.

Need to switch to using correct package, which will
fix 'psp' plugin related tests. (psp is part of pyca)

Installing correct library and enabling test fixes issue where a user
downloads pydm and runs the tests with pytest cmd directly (instead of
run_tests.py), only to see 'no module named psp' failure. This failure seems to suggest
to user to 'pip install psp', which is the wrong package and confusing.
  • Loading branch information
nstelter-slac committed Jan 23, 2025
1 parent e3fdc53 commit c194578
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
1 change: 0 additions & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ pytest-qt
pytest-cov
pytest-timeout
p4p
pyca
pre-commit
6 changes: 6 additions & 0 deletions pydm/tests/data_plugins/test_psp_plugin_component.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import time
import functools
import pydm.data_plugins.epics_plugins.psp_plugin_component
from pydm.data_plugins.epics_plugins.psp_plugin_component import Connection
Expand All @@ -19,6 +20,11 @@ def __init__(self):
def severity(self):
return None

def timestamp(self):
secs = time.time()
nanos = time.time_ns()
return secs, nanos


def test_update_ctrl_vars(monkeypatch: MonkeyPatch, signals: ConnectionSignals):
"""Invoke our callback for updating the control values for a PV as if we had a monitor on it. Verify
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ pyqtgraph>=0.12.0
qtpy
scipy>=0.12.0
six
git+https://github.com/slaclab/pyca.git
1 change: 0 additions & 1 deletion run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
# and a Windows PyCA build exists
if os.name == "nt":
args.append("--ignore=pydm/tests/data_plugins/test_p4p_plugin_component.py")
args.append("--ignore=pydm/tests/data_plugins/test_psp_plugin_component.py")

print("pytest arguments: {}".format(args))

Expand Down

0 comments on commit c194578

Please sign in to comment.