Merge pull request #1190 from mrakitin/cln-dependencies

CLN: clean up dependencies left from ophyd v2
bluesky · Jul 19, 2024 · 9c77d86 · 9c77d86
2 parents e9f51dd + 7c50e84
commit 9c77d86
Show file tree

Hide file tree

Showing 17 changed files with 3 additions and 3,095 deletions.
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Lint
-        run: pip install --user .[dev] && tox -e pre-commit,mypy
+        run: pip install --user .[dev] && tox -e pre-commit
 
   build:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
@@ -69,7 +69,7 @@ jobs:
           source ${GITHUB_WORKSPACE}/scripts/epics_docker.sh
 
       - name: Test with pytest
-        run: pytest -k "${TEST_CL} or /v2/"
+        run: pytest -k "${TEST_CL}"
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v2

diff --git a/docs/_templates/custom-class-template.rst b/docs/_templates/custom-class-template.rst
@@ -1,8 +1,3 @@
-.. note::
-
-    Ophyd.v2 is included on a provisional basis until the v2.0 release and 
-    may change API on minor release numbers before then
-
 {{ fullname | escape | underline}}
 
 .. currentmodule:: {{ module }}

diff --git a/docs/_templates/custom-module-template.rst b/docs/_templates/custom-module-template.rst
@@ -1,8 +1,3 @@
-.. note::
-
-    Ophyd.v2 is included on a provisional basis until the v2.0 release and 
-    may change API on minor release numbers before then
-
 {{ fullname | escape | underline}}
 
 .. automodule:: {{ fullname }}

diff --git a/ophyd/__init__.py b/ophyd/__init__.py
@@ -32,7 +32,7 @@ def set_cl(control_layer=None, *, pv_telemetry=False):
     # TODO replace this with fancier meta-programming
     # TODO handle control_layer being a module/nampspace directly
     if control_layer == "pyepics":
-        # If using pyepics and ophyd.v2 (p4p and aioca), need to use the same
+        # If using pyepics and ophyd-async (p4p and aioca), need to use the same
         # libCom and libCa as provided by epicscorelibs
         # https://github.com/BCDA-APS/apstools/issues/836
         try:

diff --git a/ophyd/v2/__init__.py b/ophyd/v2/__init__.py
diff --git a/ophyd/v2/_aioca.py b/ophyd/v2/_aioca.py