Merge pull request #774 from jklynch/pyepics-context-kwarg

MNT: remove deprecated kwarg "context"
bluesky · Nov 21, 2019 · 9f21ca2 · 9f21ca2
2 parents d2ed9f3 + 5a2e5c7
commit 9f21ca2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,8 +22,6 @@ cache:
 
 matrix:
   include:
-    - python: 3.5
-      env: CONDA_ENV=1
     - python: 3.6
       env: BUILD_DOCS=true CONDA_ENV=1
     - python: 3.6

diff --git a/ophyd/_pyepics_shim.py b/ophyd/_pyepics_shim.py
@@ -1,10 +1,11 @@
 import atexit
 import ctypes
-import epics
+from distutils.version import LooseVersion
 import queue
 import threading
 import warnings
 
+import epics
 from epics import get_pv as _get_pv, caget, caget, caput
 
 try:
@@ -19,8 +20,8 @@
 
 
 def get_pv(*args, **kwargs):
-    import epics
-    kwargs.setdefault('context', epics.ca.current_context())
+    if not LooseVersion(epics.__version__) >= LooseVersion('3.4.0'):
+        kwargs.setdefault('context', epics.ca.current_context())
     return _get_pv(*args, **kwargs)
 
 

diff --git a/setup.py b/setup.py
@@ -34,6 +34,7 @@
 setup(name='ophyd',
       version=versioneer.get_version(),
       cmdclass=versioneer.get_cmdclass(),
+      python_requires='>=3.6',
       license='BSD',
       install_requires=requirements,
       packages=find_packages(),