diff --git a/CHANGELOG b/CHANGELOG index d7515f0c..4f4d0bfa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ jc changelog +20210305 v1.14.4 +- Packaging fix only for binaries and RPMs hosted on https://github.com/kellyjonbrazil/jc-packaging. + Packages from PyPi and OS repositories are not affected. This fixes an issue that kept the YAML + parser from initializing. + 20210210 v1.14.3 - Add hciconfig parser tested on linux - Update dig parser to simplify answer data logic diff --git a/jc/cli.py b/jc/cli.py index 4051b862..a9b11723 100644 --- a/jc/cli.py +++ b/jc/cli.py @@ -21,7 +21,7 @@ import jc.appdirs as appdirs class info(): - version = '1.14.3' + version = '1.14.4' description = 'JSON CLI output utility' author = 'Kelly Brazil' author_email = 'kellyjonbrazil@gmail.com' diff --git a/jc/parsers/yaml.py b/jc/parsers/yaml.py index 9ccbd1a8..d21a144c 100644 --- a/jc/parsers/yaml.py +++ b/jc/parsers/yaml.py @@ -76,7 +76,7 @@ from ruamel.yaml import YAML class info(): - version = '1.1' + version = '1.2' description = 'YAML file parser' author = 'Kelly Brazil' author_email = 'kellyjonbrazil@gmail.com' @@ -134,6 +134,11 @@ def parse(data, raw=False, quiet=False): if jc.utils.has_data(data): + # monkey patch to disable plugins since we don't use them and in + # ruamel.yaml versions prior to 0.17.0 the use of __name__ in the + # plugin code is incompatible with the pyoxidizer packager + YAML.official_plug_ins = lambda a: [] + yaml = YAML(typ='safe') for document in yaml.load_all(data): diff --git a/setup.py b/setup.py index b87e486d..aad9f2a9 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open('README.md', 'r') as f: setuptools.setup( name='jc', - version='1.14.3', + version='1.14.4', author='Kelly Brazil', author_email='kellyjonbrazil@gmail.com', description='Converts the output of popular command-line tools and file-types to JSON.',