Skip to content

Commit

Permalink
Merge pull request #16 from robmckinnon/deps_update
Browse files Browse the repository at this point in the history
Update dependencies, support Elixir 1.7
  • Loading branch information
robmckinnon authored Sep 17, 2018
2 parents 974897b + 191da64 commit bb90bcc
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 28 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ elixir:
- 1.4.5
- 1.5.3
- 1.6.5
- 1.7.3
after_script:
- mix deps.get --only docs
- MIX_ENV=docs mix inch.report
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
# Changelog

## 0.0.8 (2018-09-17)

* Elixir update
* Support latest version of Elixir.
* Dependencies update
* Update to latest version of dependencies.

## 0.0.7 (2018-06-26)

* Dependencies update
* Update to latest version of depedencies.
* Update to latest version of dependencies.
* Format code with Elixir formatter.

## 0.0.6 (2017-03-19)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 Rob McKinnon
Copyright (c) 2018 Rob McKinnon

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ You can view [full DataMorph API documentation on hexdocs](https://hexdocs.pm/da

Add
```elixir
{:data_morph, "~> 0.0.6"}
{:data_morph, "~> 0.0.8"}
```
to your deps in `mix.exs` like so:

```elixir
defp deps do
[
{:data_morph, "~> 0.0.6"}
{:data_morph, "~> 0.0.8"}
]
end
```
Expand Down
28 changes: 14 additions & 14 deletions lib/data_morph/csv.ex
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@ defmodule DataMorph.Csv do
...> headers
["name","iso"]
Map a string of tab-separated lines separated by \n to headers, and a stream
of rows as lists:
iex> {headers, rows} = "name\tiso\n" <>
...> "New Zealand\tnz\n" <>
...> "United Kingdom\tgb"
...> |> DataMorph.Csv.to_headers_and_rows_stream(separator: ?\t)
...> rows
...> |> Enum.to_list
[
["New Zealand","nz"],
["United Kingdom","gb"]
]
...> headers
["name","iso"]
Map a string of tab-separated lines separated by \n to headers, and a stream
of rows as lists:
iex> {headers, rows} = "name\tiso\n" <>
...> "New Zealand\tnz\n" <>
...> "United Kingdom\tgb"
...> |> DataMorph.Csv.to_headers_and_rows_stream(separator: ?\t)
...> rows
...> |> Enum.to_list
[
["New Zealand","nz"],
["United Kingdom","gb"]
]
...> headers
["name","iso"]
"""
def to_headers_and_rows_stream(csv) do
to_headers_and_rows_stream(csv, separator: ",")
Expand Down
10 changes: 5 additions & 5 deletions mix.exs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
defmodule DataMorph.Mixfile do
use Mix.Project

@version "0.0.7"
@version "0.0.8"

def project do
[
app: :data_morph,
version: @version,
elixir: "~> 1.3 or ~> 1.4 or ~> 1.5 or ~> 1.6",
elixir: "~> 1.3 or ~> 1.4 or ~> 1.5 or ~> 1.6 or ~> 1.7",
description: description(),
deps: deps(),
package: package(),
Expand All @@ -27,10 +27,10 @@ defmodule DataMorph.Mixfile do
[
{:csv, "~> 2.1"},
# Docs dependencies
{:ex_doc, "~> 0.18", only: :docs},
{:inch_ex, "~> 0.5", only: :docs},
{:ex_doc, "~> 0.19", only: :docs},
{:inch_ex, "~> 1.0.0", only: :docs},
# Test dependencies
{:mix_test_watch, "~> 0.6", only: :dev}
{:mix_test_watch, "~> 0.9", only: :dev}
]
end

Expand Down
13 changes: 8 additions & 5 deletions mix.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
%{
"csv": {:hex, :csv, "2.1.1", "a4c1a7c30d2151b6e4976cb2f52c0a1d49ec965afb737ed84a684bc4284d1627", [:mix], [{:parallel_stream, "~> 1.0.4", [hex: :parallel_stream, repo: "hexpm", optional: false]}], "hexpm"},
"earmark": {:hex, :earmark, "1.2.5", "4d21980d5d2862a2e13ec3c49ad9ad783ffc7ca5769cf6ff891a4553fbaae761", [:mix], [], "hexpm"},
"ex_doc": {:hex, :ex_doc, "0.18.3", "f4b0e4a2ec6f333dccf761838a4b253d75e11f714b85ae271c9ae361367897b7", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
"file_system": {:hex, :file_system, "0.2.5", "a3060f063b116daf56c044c273f65202e36f75ec42e678dc10653056d3366054", [:mix], [], "hexpm"},
"earmark": {:hex, :earmark, "1.2.6", "b6da42b3831458d3ecc57314dff3051b080b9b2be88c2e5aa41cd642a5b044ed", [:mix], [], "hexpm"},
"ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
"file_system": {:hex, :file_system, "0.2.6", "fd4dc3af89b9ab1dc8ccbcc214a0e60c41f34be251d9307920748a14bf41f1d3", [:mix], [], "hexpm"},
"fs": {:hex, :fs, "0.9.2", "ed17036c26c3f70ac49781ed9220a50c36775c6ca2cf8182d123b6566e49ec59", [:rebar], []},
"inch_ex": {:hex, :inch_ex, "0.5.6", "418357418a553baa6d04eccd1b44171936817db61f4c0840112b420b8e378e67", [:mix], [{:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, optional: false]}]},
"mix_test_watch": {:hex, :mix_test_watch, "0.6.0", "5e206ed04860555a455de2983937efd3ce79f42bd8536fc6b900cc286f5bb830", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}], "hexpm"},
"inch_ex": {:hex, :inch_ex, "1.0.0", "18496a900ca4b7542a1ff1159e7f8be6c2012b74ca55ac70de5e805f14cdf939", [:mix], [{:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
"makeup": {:hex, :makeup, "0.5.5", "9e08dfc45280c5684d771ad58159f718a7b5788596099bdfb0284597d368a882", [:mix], [{:nimble_parsec, "~> 0.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
"makeup_elixir": {:hex, :makeup_elixir, "0.10.0", "0f09c2ddf352887a956d84f8f7e702111122ca32fbbc84c2f0569b8b65cbf7fa", [:mix], [{:makeup, "~> 0.5.5", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
"mix_test_watch": {:hex, :mix_test_watch, "0.9.0", "c72132a6071261893518fa08e121e911c9358713f62794a90c95db59042af375", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}], "hexpm"},
"nimble_parsec": {:hex, :nimble_parsec, "0.4.0", "ee261bb53214943679422be70f1658fff573c5d0b0a1ecd0f18738944f818efe", [:mix], [], "hexpm"},
"parallel_stream": {:hex, :parallel_stream, "1.0.6", "b967be2b23f0f6787fab7ed681b4c45a215a81481fb62b01a5b750fa8f30f76c", [:mix], [], "hexpm"},
"poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], []},
}

0 comments on commit bb90bcc

Please sign in to comment.