Skip to content
This repository was archived by the owner on Jan 11, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d55eb54
wholesale rewrite - use Ruamel's YAML library, do some parameter chec…
tb3088 Sep 1, 2017
130ec93
remove unnecessary library references
tb3088 Oct 3, 2017
aa56d1f
rewrite custom Exception handler and simplify key merge function
tb3088 Oct 3, 2017
39e9a7d
add command-line options for logging
tb3088 Oct 3, 2017
06bf80c
remove original value merge logic
tb3088 Oct 3, 2017
14c5f6b
add JSON output option
tb3088 Oct 4, 2017
f8f1c3e
add formatting support to json.dump and trap what should be theoretic…
tb3088 Oct 4, 2017
1cde1b2
define value overwriting instead of merge
tb3088 Oct 11, 2017
d61f0c3
reformat Optparse help
tb3088 Oct 12, 2017
88062e4
localize module imports
tb3088 Oct 12, 2017
5a91482
refactor all defaults to one location. move imports closer to use. re…
tb3088 Oct 12, 2017
163ef3e
collapse into __init__. small tweaks to message formatting
tb3088 Oct 12, 2017
88f1108
facilitate direct execution of module as script
tb3088 Oct 12, 2017
5999269
intermediate save on major logging and backwards compatability refactor
tb3088 Oct 14, 2017
a14e4ca
sync with __init__ to allow calling package directly
tb3088 Oct 14, 2017
d03ded8
trim bad whitespace
tb3088 Oct 14, 2017
238674e
dangling whitespace, options handling
tb3088 Dec 9, 2017
0f38a32
checkpoint - big cleanup of logging of status and exceptions
tb3088 Dec 14, 2017
24448e1
whitespace and EOL management
tb3088 Feb 26, 2018
7cef3b5
unhack class loader, and replace STDLIB/logging functions with privat…
tb3088 Mar 19, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
* text=auto
*.sh text eol=lf
*.pl text eol=lf
*.py* text eol=lf
13 changes: 13 additions & 0 deletions bin/yamlreader
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/python3

import re
import sys
import os

sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
from yamlreader import parse_cmdline, __main

if __name__ == '__main__':
(opts, args) = parse_cmdline()
sys.exit(__main(opts, args))

6 changes: 3 additions & 3 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
summary = 'Merge YAML data from given files, dir or file glob'
authors = [Author('Schlomo Schapiro', "schlomo.schapiro@immobilienscout24.de")]
url = 'https://github.com/ImmobilienScout24/yamlreader'
version = '3.0.4'
version = '3.1.0'
description = open("README.rst").read()
license = 'Apache License 2.0'

Expand All @@ -22,10 +22,10 @@

@init
def set_properties(project):
project.depends_on("PyYAML")
project.depends_on("ruamel.yaml")
project.depends_on("six")

project.set_property('distutils_console_scripts', ['yamlreader=yamlreader.yamlreader:__main'])
project.set_property('distutils_console_scripts', ['yamlreader=yamlreader:__main__'])

project.set_property("distutils_classifiers", [
"Programming Language :: Python",
Expand Down
Loading