Commit bf0384fe authored by Thomas Nadovich's avatar Thomas Nadovich 🌸
Browse files

Merge branch 'feature/yaml-fix' into 'devel'

added /resources to pyinstaller updated objdict_schema to YAML 1.2

See merge request !4
parents dcb80622 03e956b2
Pipeline #16946 passed with stage
in 49 seconds
## [dev-1.0.7]
- added resource path to pyinstaller build
- updated objdict yaml schema to YAML 1.2
## [dev-1.0.6]
- set up repo to build an executable binary like burt-util
- un-specified package versions
......
......@@ -14,6 +14,7 @@ RELEASE_TYPE=dev
DEB=$(PACKAGING_DIR)/$(NAME)_$(VERSION)_amd64.deb
PROGRAM_OUTDIR= bin/Debug/
ENTRYPOINT=objdict_generate/scripts/objdict_generate.py
RESOURCE_PATH=objdict_generate/resources/
EXE = $(DIST_DIR)/$(NAME)
......@@ -22,7 +23,7 @@ all: build
.PHONY: build
build: $(EXE)
$(EXE): $(ENTRYPOINT)
pyinstaller $< --onefile -n $(NAME)
pyinstaller $< --onefile -n $(NAME) --add-data '$(RESOURCE_PATH)*:$(RESOURCE_PATH)'
.PHONY: package
......
......@@ -19,7 +19,7 @@ click_didyoumean = "*"
semver = "*"
jinja2 = "*"
canopen = "*"
PyYaml = "*"
PyYaml = ">=6.0"
configparser = "*"
pykwalify = "*"
pykwalify = ">=1.8.0"
arrow = "*"
{
"_meta": {
"hash": {
"sha256": "f985fbdd13f17d7e1991a5e1ad907d82d60e86dc1eb43143ae527e83300fb628"
"sha256": "fe2e976b5efd1a2a2a6b3a40b3b571b7bd11490c3944537ccb842989d53719bf"
},
"pipfile-spec": 6,
"requires": {
......@@ -18,11 +18,11 @@
"default": {
"aenum": {
"hashes": [
"sha256:1d494e4d3b3e3e95389aee420203d945776d2430ee9a3d4f162e267b3a7ec3a6",
"sha256:a3e86312ca58611236900b77e863d2b9034dfe8956a089a2935b55974eb33f1f",
"sha256:c3dba3d5482d09ea371651d8da08cb21e0b8a826970bb08a3b30789b4a7b91a9"
"sha256:2ebad8590b6a0183c0d9893523b458edce987ae4533339c5ac185cfac32daf1a",
"sha256:7db6e790434baece9e14a97da69118edc89ade821f36590ce32a295f1e500e89",
"sha256:d50b9f8aa3e75c179056182820227eb09485e0bd07f968983744dfbd11958350"
],
"version": "==3.1.3"
"version": "==3.1.5"
},
"arrow": {
"hashes": [
......@@ -181,7 +181,7 @@
"sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
"sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==2.8.2"
},
"pyyaml": {
......@@ -255,7 +255,7 @@
"sha256:dc6a613d6c74eef5a14a214d433d06291526145431c3b964f5e16529b1842bed",
"sha256:de9c6b8a1ba52919ae919f3ae96abb72b994dd0350226e28f3686cb4f142165c"
],
"markers": "platform_python_implementation == 'CPython' and python_version < '3.10'",
"markers": "python_version < '3.10' and platform_python_implementation == 'CPython'",
"version": "==0.2.6"
},
"semver": {
......@@ -271,7 +271,7 @@
"sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
"sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==1.16.0"
},
"wrapt": {
......@@ -335,11 +335,11 @@
"develop": {
"aenum": {
"hashes": [
"sha256:1d494e4d3b3e3e95389aee420203d945776d2430ee9a3d4f162e267b3a7ec3a6",
"sha256:a3e86312ca58611236900b77e863d2b9034dfe8956a089a2935b55974eb33f1f",
"sha256:c3dba3d5482d09ea371651d8da08cb21e0b8a826970bb08a3b30789b4a7b91a9"
"sha256:2ebad8590b6a0183c0d9893523b458edce987ae4533339c5ac185cfac32daf1a",
"sha256:7db6e790434baece9e14a97da69118edc89ade821f36590ce32a295f1e500e89",
"sha256:d50b9f8aa3e75c179056182820227eb09485e0bd07f968983744dfbd11958350"
],
"version": "==3.1.3"
"version": "==3.1.5"
},
"altgraph": {
"hashes": [
......@@ -503,7 +503,7 @@
},
"objdict-generate": {
"path": ".",
"version": "==1.0.5"
"version": "==1.0.7"
},
"pyinstaller": {
"hashes": [
......@@ -539,7 +539,7 @@
"sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
"sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==2.8.2"
},
"pyyaml": {
......@@ -613,7 +613,7 @@
"sha256:dc6a613d6c74eef5a14a214d433d06291526145431c3b964f5e16529b1842bed",
"sha256:de9c6b8a1ba52919ae919f3ae96abb72b994dd0350226e28f3686cb4f142165c"
],
"markers": "platform_python_implementation == 'CPython' and python_version < '3.10'",
"markers": "python_version < '3.10' and platform_python_implementation == 'CPython'",
"version": "==0.2.6"
},
"semver": {
......@@ -629,7 +629,7 @@
"sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
"sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==1.16.0"
},
"wrapt": {
......
......@@ -2,35 +2,35 @@ type: map
mapping:
author:
type: str
required: yes
required: true
definition_id:
type: int
required: yes
required: true
node_id:
type: int
required: yes
required: true
dependencies:
type: seq
sequence:
- type: str
description:
type: str
required: yes
required: true
module_name:
type: str
required: yes
required: true
prefix:
type: str
required: yes
required: true
module_namespace:
type: str
required: yes
required: true
title:
type: str
required: yes
required: true
version:
type: int
required: yes
required: true
indexes:
type: seq
sequence:
......@@ -38,45 +38,45 @@ mapping:
mapping:
index:
type: int
required: yes
required: true
subindex:
type: int
required: yes
required: true
name:
type: str
required: yes
required: true
datatype:
type: str
required: yes
required: true
enum: ["U32","I32","U16","I16","U8","I8","R32"]
access:
type: str
required: yes
required: true
enum: ["RO", "WO", "RW"]
save:
type: bool
required: no
required: false
default:
type: number
required: no
required: false
comment:
type: str
required: yes
required: true
constdefault:
type: str
required: no
required: false
jinja2default:
type: str
required: no
required: false
export_for_mainboard:
type: bool
required: no
required: false
readCallback:
type: str
required: no
required: false
writeCallback:
type: str
required: no
required: false
array:
type: bool
required: no
required: false
......@@ -111,7 +111,7 @@ def cli(ctx, doc_dir, output_dir, master_dir, yaml_files):
sys.exit(1)
# Next lets read that yaml file into a python dictionary.
objdict = yaml.load(open(yaml_file))
objdict = yaml.load(open(yaml_file), yaml.Loader)
# Find all array types and expand them out.
for (j, index) in enumerate(objdict['indexes']):
......
#!/usr/bin/env python3
__version__ = "1.0.6"
__version__ = "1.0.7"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment