summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* version bump0.10.5Anthon van der Neut2015-08-255-9/+90
|
* Merged in samthursfield/yaml (pull request #4)Anthon van der Neut2015-08-253-7/+64
|\ | | | | | | Fix assertion failure for certain kinds of merges
| * Merge tipSam Thursfield2015-08-242-4/+39
| |\
| | * Fix assertoin failure for certain kinds of mergesSam Thursfield2015-08-242-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RoundTripConstructor.flatten_mapping() method made an assumption that when merging a mapping into another mapping, the actual data would have been defined already. For example: predefined: &contents { a: 1 } merged: <<: *contents However, the following is valid as well, and in this case the data is only defined at the point of merging: merged-1: <<: &contents { a: 1 } merged-2: <<: *contents This commit fixes an assertion failure for the latter case.
| * | Merged ruamel/yaml into defaultSam Thursfield2015-08-243-7/+64
| |\ \ | | |/ | |/|
| | * Fix extra trailing line break with `|-` block literalsSam Thursfield2015-07-162-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Emitter.write_literal() function will write a line break after a block literal value if the block literal didn't end with a line break. The Scanner.scan_block_scalar() function was keeping track of all newlines that followed block literals, but when `|-` is used it this was one too many. The code is changed slightly to avoid a confusing `if chomping is not False` statement.
| | * Preserve blank lines after block scalarsSam Thursfield2015-07-142-5/+39
| | |
| | * Preserve blank lines after commentsSam Thursfield2015-07-142-4/+9
| | |
| | * Preserve some of the blank lines in the input when round-tripping.Sam Thursfield2015-07-132-1/+22
| | |
* | | Fix assertion failure for certain kinds of mergesSam Thursfield2015-08-242-4/+39
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RoundTripConstructor.flatten_mapping() method made an assumption that when merging a mapping into another mapping, the actual data would have been defined already. For example: predefined: &contents { a: 1 } merged: <<: *contents However, the following is valid as well, and in this case the data is only defined at the point of merging: merged-1: <<: &contents { a: 1 } merged-2: <<: *contents This commit fixes an assertion failure for the latter case.
* | ignore unknown directives %YAML:1.1 (without colon)Anthon van der Neut2015-08-077-5/+64
|/
* fix issue with anchors on sequences (reported by Bjorn Stabell)Anthon van der Neut2015-07-043-1/+29
| | | | https://bitbucket.org/ruamel/yaml/issue/7/anchor-names-not-preserved
* parameterised maximum lenght of simple keyAnthon van der Neut2015-07-031-1/+3
|
* - set anchor explicitly (yaml_set_anchor)Anthon van der Neut2015-06-236-10/+228
| | | | - add before item comment (yaml_set_start_comment)
* - bump minor versionAnthon van der Neut2015-06-2212-29/+409
| | | | | - preserve hand-crafted anchor/reference names (non `idNNN`) - preserve merges http://yaml.org/type/merge.html
* add from CSVAnthon van der Neut2015-06-211-0/+46
|
* - add normal merge processing to RoundTripLoaderAnthon van der Neut2015-06-211-0/+8
|
* - --test option for reading from iniAnthon van der Neut2015-06-182-2/+9
| | | | - allow from-json to read from stdin with '-'
* added multilevel get on CommentedMap (mlget())Anthon van der Neut2015-06-135-3/+89
|
* - remove tmpdir printAnthon van der Neut2015-06-053-2/+4
| | | | | - update for so-30328549-yaml-preprocessor-macro-processor/ so that you can have construct_scalar return a non string
* py3 compatibilityAnthon van der Neut2015-06-052-1/+1
| | | | wheel for pypy2
* version numberAnthon van der Neut2015-06-051-1/+1
|
* keep start and end sequence when doing 'yaml rt'Anthon van der Neut2015-06-054-49/+154
|
* missing 0.9.4 filesAnthon van der Neut2015-06-025-0/+540
|
* up-ed micro versionAnthon van der Neut2015-06-021-1/+1
|
* initial html conversionAnthon van der Neut2015-06-025-335/+33
|
* make purity of wheel depend on --universalAnthon van der Neut2015-05-281-1/+2
|
* - tests run on windows 2.6. and 2.7 (3.3/3.4 have someinstall problems)Anthon van der Neut2015-05-285-7/+48
| | | | - generate .whl for various windows version/platform combination (universal)
* added test and fix for json numbers ( 1e-06 and 3.0e4 )Anthon van der Neut2015-05-275-3/+123
|
* flow and non-flow style for yaml jsonAnthon van der Neut2015-05-131-1/+1
|
* flow and non-flow style for yaml jsonAnthon van der Neut2015-05-132-3/+7
|
* updated descriptionAnthon van der Neut2015-04-182-0/+6
|
* merged line_no branchAnthon van der Neut2015-04-180-0/+0
|\
* | added line and column to collection typesAnthon van der Neut2015-04-187-13/+86
|/
* added add/update of eol commentsAnthon van der Neut2015-04-152-0/+250
|
* added add/update of eol commentsAnthon van der Neut2015-04-155-11/+166
|
* roundtrip ordereddict bugAnthon van der Neut2015-04-144-32/+21
|
* preserve eol comments on flow style sequences/mappingsAnthon van der Neut2015-03-2911-21/+111
|
* updated short descriptionAnthon van der Neut2015-03-271-2/+2
|
* version bump, tox rerunAnthon van der Neut2015-03-272-5/+5
|\
| * Minor spelling changesAnthony Sottile2015-03-261-2/+2
| |
* | flow mapping style preservation + testsAnthon van der Neut2015-03-274-2/+58
| |
* | 0.7Anthon van der Neut2015-03-263-4/+6
|/
* preserve flow style on sequences for roundtrip handling 'a: b, c, d'Anthon van der Neut2015-03-266-3/+16
|
* initial test and first step implementation to preserve (flow) styleAnthon van der Neut2015-03-267-5/+68
|
* Merged in asottile/yaml (pull request #1)Anthon van der Neut2015-03-261-0/+32
|\ | | | | | | | | | | Add failing tests for indentation: - allow round-trip preservation of sequence flow style for list - allow round-trip preservation of space between block sequence dash and scalar
| * Add failing tests for indentationAnthony Sottile2015-03-251-0/+32
| |
* | remove assert dependency requiring the yaml directory to be under ↵Anthon van der Neut2015-03-261-4/+0
|/ | | | site-packages/ruamel
* now installs and tests for pypy (by testing in setup.py and notAnthon van der Neut2015-03-185-13/+12
| | | | depending on ruamel.ordereddict if not CPython 2.x series)
* scalars with preserved newlinesAnthon van der Neut2015-03-116-10/+141
|
View Lorry Controller Status