Fix packaging and linting issues

epics-containers · Jan 14, 2022 · 502e4d0 · 502e4d0
1 parent 36b2a6e
commit 502e4d0
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,6 @@ repos:
     rev: v2.3.0
     hooks:
       - id: check-added-large-files
-      - id: check-yaml
       - id: check-merge-conflict
 
   - repo: local

diff --git a/setup.cfg b/setup.cfg
@@ -43,9 +43,11 @@ dev =
 where = src
 
 # Specify any package data to be included in the wheel below.
-# [options.package_data]
-# ibek =
-#     subpackage/*.yaml
+[options.package_data]
+ibek =
+    helm-template/*/*
+    helm-template/*
+    templates/*
 
 [options.entry_points]
 # Include a command line script

diff --git a/helm-template/Chart.yaml.jinja → src/ibek/helm-template/Chart.yaml.jinja b/helm-template/Chart.yaml.jinja → src/ibek/helm-template/Chart.yaml.jinja
diff --git a/helm-template/config/start.sh → src/ibek/helm-template/config/start.sh b/helm-template/config/start.sh → src/ibek/helm-template/config/start.sh
diff --git a/helm-template/templates/ioc.yaml → src/ibek/helm-template/templates/ioc.yaml b/helm-template/templates/ioc.yaml → src/ibek/helm-template/templates/ioc.yaml
diff --git a/helm-template/values.yaml.jinja → src/ibek/helm-template/values.yaml.jinja b/helm-template/values.yaml.jinja → src/ibek/helm-template/values.yaml.jinja
diff --git a/src/ibek/helm.py b/src/ibek/helm.py
@@ -25,8 +25,7 @@
 
 log = logging.getLogger(__name__)
 
-# TODO: these are not packaged, should move them to src/ibek
-HELM_TEMPLATE = Path(__file__).parent.parent.parent / "helm-template"
+HELM_TEMPLATE = Path(__file__).parent / "helm-template"
 TEMPLATES = Path(__file__).parent / "templates"
 
 schema_modeline = re.compile(r"# *yaml-language-server *: *\$schema=([^ ]*)")

diff --git a/src/ibek/ioc.py b/src/ibek/ioc.py
@@ -6,7 +6,7 @@
 
 import types
 from dataclasses import Field, dataclass, field, make_dataclass
-from typing import Any, Dict, List, Mapping, Sequence, Tuple, Type, Union, cast
+from typing import Any, Dict, List, Mapping, Sequence, Tuple, Type, cast
 
 from apischema import (
     Undefined,