Skip to content

Commit

Permalink
Update depedencies
Browse files Browse the repository at this point in the history
  • Loading branch information
TeXitoi committed Oct 6, 2016
1 parent e8ddcab commit 7061102
Show file tree
Hide file tree
Showing 22 changed files with 492 additions and 2,875 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/target/*
libs/*/target/*
build_packages/*
*~
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ matrix:

script:
- cargo test
- if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --no-default-features --features nightly; fi
# These test "almost" fail because of a bug of cargo (TODO: link to bug)
- cargo test --package bragi
- cargo test --package mimir
- if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --package bragi --no-default-features --features nightly; fi
- if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --package mimir --no-default-features --features nightly; fi

services:
- docker
700 changes: 404 additions & 296 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@ version = "1.2.0"
authors = ["Canal TP <[email protected]>"]
build = "build.rs"

[workspace]

[dependencies]
log = "*"
docopt = "*"
rustc-serialize = "*"
csv = "*"
rs-es = { version = "^0.4.4", default-features = false }
rs-es = "0.5"
regex = "*"
osmpbfreader = "*"
chrono = "0.2"
serde = "^0.7.10"
serde = "0.8"
geo = "0.1.1"
gst = "0.1"
ordered-float = "0.0.2"
Expand All @@ -22,14 +24,14 @@ mdo = "*"
[dev-dependencies]
serde_json = "*"
hyper = "^0.9"
iron-test = "0.3.0"
iron-test = "*"
rustless = "*"
iron = "*"
mime = "0.2"

[features]
default = ["rs-es/default", "bragi/default", "mimir/default"]
#nightly = ["bragi/nightly", "mimir/nightly"]
default = ["bragi/default", "mimir/default"]
nightly = ["bragi/nightly", "mimir/nightly"]

[dependencies.bragi]
path = "libs/bragi"
Expand Down
Loading

0 comments on commit 7061102

Please sign in to comment.