Merge pull request #109 from epics-containers/dev

FInal Support Schema changes

.github/workflows/code.yml

@@ -96,12 +96,6 @@ jobs:
           name: dist
           path: dist
 
-      - name: Upload support yaml schema
-        uses: actions/upload-artifact@v3
-        with:
-          name: ibek.support.schema.json
-          path: tests/samples/schemas/ibek.support.schema.json
-
       - name: Check for packaging errors
         run: pipx run twine check --strict dist/*
 
@@ -145,7 +139,7 @@ jobs:
           files: |
             dist/*
             lockfiles/*
-            ibek.support.schema.json
+            tests/samples/schemas/ibek.support.schema.json
           generate_release_notes: true
 
         env:

.gitignore

@@ -69,3 +69,6 @@ lockfiles/
 
 # ruff cache
 .ruff_cache/
+
+# default filename for builder2ibek
+**/ibek.support.yaml

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.3.0
     hooks:
       - id: check-added-large-files
       - id: check-yaml

.vscode/launch.json

@@ -4,6 +4,20 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            // To use this debug configuration you must have access to dls-python
+            // (python 2.7) and downgrade vscode Python extension to 2021.9.1246542782
+            "name": "builder2ibek",
+            "type": "python",
+            "python": "/dls_sw/prod/tools/RHEL7-x86_64/defaults/bin/dls-python",
+            "request": "launch",
+            "program": "builder2ibek.support.py",
+            "console": "integratedTerminal",
+            "args": [
+                "/dls_sw/prod/R3.14.12.7/support/ADCore/3-9dls2",
+            ],
+            "justMyCode": false
+        },
         {
             "name": "Debug example test",
             "type": "python",
@@ -22,4 +36,4 @@
             },
         }
     ]
-}
+}

.vscode/settings.json

@@ -4,19 +4,19 @@
     "python.linting.mypyEnabled": true,
     "python.linting.enabled": true,
     "python.testing.pytestArgs": [
-        "--cov=python3_pip_skeleton",
+        "--cov=ibek",
         "--cov-report",
         "xml:cov.xml"
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
-    "python.formatting.provider": "black",
     "python.languageServer": "Pylance",
     "editor.formatOnSave": true,
     "[python]": {
         "editor.codeActionsOnSave": {
             "source.fixAll.ruff": false,
-            "source.organizeImports.ruff": true
+            "source.organizeImports.ruff": true,
+            "source.black": true,
         }
     }
-}
+}