on master help sign in
Move yaml package into its own subdirectory.
commit6962aca865a4301c159e4debef7fce1c623a21ee authorAlex Franchuk <afranchuk@lgsinnovations.com> dateThu 11 Oct 2018, 09:15 (8 years ago) parent2f6dad7
37 files changed+35−16
README.md+14−13 stack.yaml+1−1 ChangeLog.md → yaml/ChangeLog.md+1−1 LICENSE → yaml/LICENSE yaml/README.md+18 Setup.lhs → yaml/Setup.lhs builder-test.hs → yaml/builder-test.hs examples/Config.hs → yaml/examples/Config.hs examples/Main.hs → yaml/examples/Main.hs examples/Simple.hs → yaml/examples/Simple.hs exe/json2yaml.hs → yaml/exe/json2yaml.hs exe/yaml2json.hs → yaml/exe/yaml2json.hs package.yaml → yaml/package.yaml+1−1 parser-test.hs → yaml/parser-test.hs src/Data/Yaml.hs → yaml/src/Data/Yaml.hs src/Data/Yaml/Aeson.hs → yaml/src/Data/Yaml/Aeson.hs src/Data/Yaml/Builder.hs → yaml/src/Data/Yaml/Builder.hs src/Data/Yaml/Config.hs → yaml/src/Data/Yaml/Config.hs src/Data/Yaml/Include.hs → yaml/src/Data/Yaml/Include.hs src/Data/Yaml/Internal.hs → yaml/src/Data/Yaml/Internal.hs src/Data/Yaml/Parser.hs → yaml/src/Data/Yaml/Parser.hs src/Data/Yaml/Pretty.hs → yaml/src/Data/Yaml/Pretty.hs src/Data/Yaml/TH.hs → yaml/src/Data/Yaml/TH.hs test/Data/Yaml/IncludeSpec.hs → yaml/test/Data/Yaml/IncludeSpec.hs test/Data/Yaml/THSpec.hs → yaml/test/Data/Yaml/THSpec.hs test/Data/YamlSpec.hs → yaml/test/Data/YamlSpec.hs test/Spec.hs → yaml/test/Spec.hs test/json.yaml → yaml/test/json.yaml test/largest-string.yaml → yaml/test/largest-string.yaml test/resources/accent/foo.yaml → yaml/test/resources/accent/foo.yaml test/resources/bar.yaml → yaml/test/resources/bar.yaml test/resources/baz.yaml → yaml/test/resources/baz.yaml test/resources/empty.yaml → yaml/test/resources/empty.yaml test/resources/empty2.yaml → yaml/test/resources/empty2.yaml test/resources/foo.yaml → yaml/test/resources/foo.yaml test/resources/loop/bar.yaml → yaml/test/resources/loop/bar.yaml test/resources/loop/foo.yaml → yaml/test/resources/loop/foo.yaml
README.md+14−13
@@ -1,20 +1,21 @@
1−## yaml
1+# YAML Haskell Library
22
3−[![Build Status](https://travis-ci.org/snoyberg/yaml.svg?branch=master)](https://travis-ci.org/snoyberg/yaml)
4−[![Build status](https://ci.appveyor.com/api/projects/status/hqy2jketp8m502so/branch/master?svg=true)](https://ci.appveyor.com/project/snoyberg/yaml/branch/master)
3+This project contains two haskell packages: `yaml` for higher-level parsing and writing of yaml documents, and `libyaml`
4+for lower-level event-based streaming.
55
6−Provides support for parsing and emitting Yaml documents.
6+## `yaml` Package
77
8−This project includes a `libyaml` package, which has the [full libyaml C library version 0.2.1 by Kirill Simonov](https://github.com/yaml/libyaml) in the package so you don't need to worry about any non-Haskell dependencies.
8+`yaml` provides a high-level interface based around the JSON datatypes provided by the `aeson` package. This allows
9+using JSON and YAML interchangeably in your code with the `aeson` typeclasses. See the
10+[yaml README](https://github.com/snoyberg/yaml/tree/master/libyaml/README.md) for more details.
911
10−The project is broken down into two primary packages/modules. `yaml` contains `Data.Yaml`, which provides a high-level interface based around the JSON datatypes provided by the `aeson` package. `libyaml` contains `Text.Libyaml`, which provides a lower-level, streaming interface. For most users, `yaml` and `Data.Yaml` is recommended.
12+## `libyaml` Package
1113
12−### Examples
14+`libyaml` is a wrapper over the libyaml C library (and includes the source so no external library is needed). It is an
15+event-based streaming API. See the [libyaml README](https://github.com/snoyberg/yaml/tree/master/libyaml/README.md) for
16+more details.
1317
14−Usage examples can be found in the `Data.Yaml` documentation or in the [examples](https://github.com/snoyberg/yaml/tree/master/examples) directory.
18+## License
1519
16−### Additional `yaml` modules
17−
18−* `Data.Yaml.Include` supports adding `!include` directives to your YAML files.
19−* `Data.Yaml.Builder` and `Data.Yaml.Parser` allow more fine-grained control of parsing an rendering, as opposed to just using the aeson typeclass and datatype system for parsing and rendering.
20−* `Data.Yaml.Aeson` is currently a re-export of `Data.Yaml` to explicitly choose to use the aeson-compatible API.
20+This project is licensed with the BSD 3-Clause license. Copies of the license can be found in both the `yaml` and
21+`libyaml` subdirectories
stack.yaml+1−1
@@ -5,5 +5,5 @@ flags:
55 no-examples: false
66
77packages:
8− - .
8+ - yaml
99 - libyaml
ChangeLog.md → yaml/ChangeLog.mdrenamed+1−1
@@ -1,6 +1,6 @@
11# ChangeLog for yaml
22
3−## 0.10.4.1
3+## 0.11.0.0
44
55* Split out the `libyaml` and `Text.Libyaml` code into its own package. [#145](https://github.com/snoyberg/yaml/issues/145)
66
LICENSE → yaml/LICENSErenamed

The content is the same.

yaml/README.mdnew file+18
@@ -0,0 +1,18 @@
1+## yaml
2+
3+[![Build Status](https://travis-ci.org/snoyberg/yaml.svg?branch=master)](https://travis-ci.org/snoyberg/yaml)
4+[![Build status](https://ci.appveyor.com/api/projects/status/hqy2jketp8m502so/branch/master?svg=true)](https://ci.appveyor.com/project/snoyberg/yaml/branch/master)
5+
6+Provides support for parsing and emitting Yaml documents.
7+
8+`Data.Yaml` provides a high-level interface based around the JSON datatypes provided by the `aeson` package. It uses `Text.Libyaml` from `libyaml` in its implementation of the low-level yaml encoder/decoder.
9+
10+### Examples
11+
12+Usage examples can be found in the `Data.Yaml` documentation or in the [examples](https://github.com/snoyberg/yaml/tree/master/yaml/examples) directory.
13+
14+### Additional `yaml` modules
15+
16+* `Data.Yaml.Include` supports adding `!include` directives to your YAML files.
17+* `Data.Yaml.Builder` and `Data.Yaml.Parser` allow more fine-grained control of parsing an rendering, as opposed to just using the aeson typeclass and datatype system for parsing and rendering.
18+* `Data.Yaml.Aeson` is currently a re-export of `Data.Yaml` to explicitly choose to use the aeson-compatible API.
Setup.lhs → yaml/Setup.lhsrenamed

The content is the same.

builder-test.hs → yaml/builder-test.hsrenamed

The content is the same.

examples/Config.hs → yaml/examples/Config.hsrenamed

The content is the same.

examples/Main.hs → yaml/examples/Main.hsrenamed

The content is the same.

examples/Simple.hs → yaml/examples/Simple.hsrenamed

The content is the same.

exe/json2yaml.hs → yaml/exe/json2yaml.hsrenamed

The content is the same.

exe/yaml2json.hs → yaml/exe/yaml2json.hsrenamed

The content is the same.

package.yaml → yaml/package.yamlrenamed+1−1
@@ -1,5 +1,5 @@
11name: yaml
2−version: 0.10.4.1
2+version: 0.11.0.0
33synopsis: Support for parsing and rendering YAML documents.
44description: README and API documentation are available at <https://www.stackage.org/package/yaml>
55category: Data
parser-test.hs → yaml/parser-test.hsrenamed

The content is the same.

src/Data/Yaml.hs → yaml/src/Data/Yaml.hsrenamed

The content is the same.

src/Data/Yaml/Aeson.hs → yaml/src/Data/Yaml/Aeson.hsrenamed

The content is the same.

src/Data/Yaml/Builder.hs → yaml/src/Data/Yaml/Builder.hsrenamed

The content is the same.

src/Data/Yaml/Config.hs → yaml/src/Data/Yaml/Config.hsrenamed

The content is the same.

src/Data/Yaml/Include.hs → yaml/src/Data/Yaml/Include.hsrenamed

The content is the same.

src/Data/Yaml/Internal.hs → yaml/src/Data/Yaml/Internal.hsrenamed

The content is the same.

src/Data/Yaml/Parser.hs → yaml/src/Data/Yaml/Parser.hsrenamed

The content is the same.

src/Data/Yaml/Pretty.hs → yaml/src/Data/Yaml/Pretty.hsrenamed

The content is the same.

src/Data/Yaml/TH.hs → yaml/src/Data/Yaml/TH.hsrenamed

The content is the same.

test/Data/Yaml/IncludeSpec.hs → yaml/test/Data/Yaml/IncludeSpec.hsrenamed

The content is the same.

test/Data/Yaml/THSpec.hs → yaml/test/Data/Yaml/THSpec.hsrenamed

The content is the same.

test/Data/YamlSpec.hs → yaml/test/Data/YamlSpec.hsrenamed

The content is the same.

test/Spec.hs → yaml/test/Spec.hsrenamed

The content is the same.

test/json.yaml → yaml/test/json.yamlrenamed

The content is the same.

test/largest-string.yaml → yaml/test/largest-string.yamlrenamed

The content is the same.

test/resources/accent/foo.yaml → yaml/test/resources/accent/foo.yamlrenamed

The content is the same.

test/resources/bar.yaml → yaml/test/resources/bar.yamlrenamed

The content is the same.

test/resources/baz.yaml → yaml/test/resources/baz.yamlrenamed

The content is the same.

test/resources/empty.yaml → yaml/test/resources/empty.yamlrenamed

The content is the same.

test/resources/empty2.yaml → yaml/test/resources/empty2.yamlrenamed

The content is the same.

test/resources/foo.yaml → yaml/test/resources/foo.yamlrenamed

The content is the same.

test/resources/loop/bar.yaml → yaml/test/resources/loop/bar.yamlrenamed

The content is the same.

test/resources/loop/foo.yaml → yaml/test/resources/loop/foo.yamlrenamed

The content is the same.