Merge pull request #167 from klauer/fix_blark

FIX: TwinCAT plugin / blark and pytmc integration
pcdshub · Aug 23, 2023 · 62e5426 · 62e5426
2 parents b6701db + 78e9e97
commit 62e5426
Show file tree

Hide file tree

Showing 11 changed files with 647 additions and 69 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "whatrecord/tests/blark-twincat-root-example"]
+	path = whatrecord/tests/blark_root
+	url = https://github.com/klauer/blark-twincat-root-example
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -30,6 +30,7 @@ requirements:
 
 test:
   requires:
+    - blark
     - codecov
     - flake8
     - happi

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -7,6 +7,7 @@ pytest-aiohttp
 pytest-cov
 
 # plugin dependencies
+blark
 happi
 python-ldap
 pytmc
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ requirements: @@
     test:
       requires:
+        - blark
         - codecov
         - flake8
         - happi
@@ Expand Down @@