mirror of
https://github.com/kellyjonbrazil/jc.git
synced 2025-06-17 00:07:37 +02:00
packaging fix for yaml parser and pyoxidizer
This commit is contained in:
@ -1,5 +1,10 @@
|
|||||||
jc changelog
|
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
|
20210210 v1.14.3
|
||||||
- Add hciconfig parser tested on linux
|
- Add hciconfig parser tested on linux
|
||||||
- Update dig parser to simplify answer data logic
|
- Update dig parser to simplify answer data logic
|
||||||
|
@ -21,7 +21,7 @@ import jc.appdirs as appdirs
|
|||||||
|
|
||||||
|
|
||||||
class info():
|
class info():
|
||||||
version = '1.14.3'
|
version = '1.14.4'
|
||||||
description = 'JSON CLI output utility'
|
description = 'JSON CLI output utility'
|
||||||
author = 'Kelly Brazil'
|
author = 'Kelly Brazil'
|
||||||
author_email = 'kellyjonbrazil@gmail.com'
|
author_email = 'kellyjonbrazil@gmail.com'
|
||||||
|
@ -76,7 +76,7 @@ from ruamel.yaml import YAML
|
|||||||
|
|
||||||
|
|
||||||
class info():
|
class info():
|
||||||
version = '1.1'
|
version = '1.2'
|
||||||
description = 'YAML file parser'
|
description = 'YAML file parser'
|
||||||
author = 'Kelly Brazil'
|
author = 'Kelly Brazil'
|
||||||
author_email = 'kellyjonbrazil@gmail.com'
|
author_email = 'kellyjonbrazil@gmail.com'
|
||||||
@ -134,6 +134,11 @@ def parse(data, raw=False, quiet=False):
|
|||||||
|
|
||||||
if jc.utils.has_data(data):
|
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')
|
yaml = YAML(typ='safe')
|
||||||
|
|
||||||
for document in yaml.load_all(data):
|
for document in yaml.load_all(data):
|
||||||
|
2
setup.py
2
setup.py
@ -5,7 +5,7 @@ with open('README.md', 'r') as f:
|
|||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
name='jc',
|
name='jc',
|
||||||
version='1.14.3',
|
version='1.14.4',
|
||||||
author='Kelly Brazil',
|
author='Kelly Brazil',
|
||||||
author_email='kellyjonbrazil@gmail.com',
|
author_email='kellyjonbrazil@gmail.com',
|
||||||
description='Converts the output of popular command-line tools and file-types to JSON.',
|
description='Converts the output of popular command-line tools and file-types to JSON.',
|
||||||
|
Reference in New Issue
Block a user