Skip to content

Commit

Permalink
MNT: install correct pyca with conda. pyca requires us to explicity u…
Browse files Browse the repository at this point in the history
…se previous release of epicscorelibs

This test can be enabled now that we are using correct pyca package from
conda. (was done in commit:
cd41385)

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 entirely the wrong package and
just leads to further confusion.
  • Loading branch information
nstelter-slac committed Dec 4, 2024
1 parent cd41385 commit 348cda8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ requirements:
- pyqtgraph
- qtpy
- entrypoints
- pyca

test:
imports:
Expand Down
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
epicscorelibs==7.0.7.99.0.2
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 348cda8

Please sign in to comment.