Merge pull request #21 from JuliaML/minor_updates

Minor updates

Author: Evizero

.travis.yml

@@ -3,7 +3,8 @@ os:
   - linux
   - osx
 julia:
-  - 0.6
+  - 0.7
+  - 1.0
   - nightly
 notifications:
   email: false
@@ -22,7 +23,11 @@ addons:
 install:
   #- sudo pip install pymdown-extensions
 
+# uncomment the following lines to override the default test script
+#script:
+#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+#  - julia --check-bounds=yes -e 'using Pkg; Pkg.add(pwd()); Pkg.build("MLDatasets"); Pkg.test("MLDatasets"; coverage=true)'
+
 after_success:
-  - julia -e 'cd(Pkg.dir("MLDatasets")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
-  - julia -e 'Pkg.add("Documenter")'
-  - julia -e 'cd(Pkg.dir("MLDatasets")); include(joinpath("docs", "make.jl"))'
+  - julia -e 'using Pkg, MLDatasets; cd(joinpath(dirname(pathof(MLDatasets)), "..")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())';
+  - julie -e 'using Pkg; Pkg.add("Documenter"); cd(joinpath(dirname(pathof(MLDatasets)), "..")); include(joinpath("docs", "make.jl"))'

README.md

@@ -1,5 +1,9 @@
 # MLDatasets.jl
 
+[![Julia 0.6 Status](http://pkg.julialang.org/badges/MLDatasets_0.6.svg)](http://pkg.julialang.org/?pkg=MLDatasets&ver=0.6)
+[![Julia 0.7 Status](http://pkg.julialang.org/badges/MLDatasets_0.7.svg)](http://pkg.julialang.org/?pkg=MLDatasets&ver=0.7)
+[![Julia 1.0 Status](http://pkg.julialang.org/badges/MLDatasets_1.0.svg)](http://pkg.julialang.org/?pkg=MLDatasets&ver=1.0)
+
 [![Docs](https://img.shields.io/badge/docs-stable-blue.svg)](https://JuliaML.github.io/MLDatasets.jl/stable)
 [![Build Status](https://travis-ci.org/JuliaML/MLDatasets.jl.svg?branch=master)](https://travis-ci.org/JuliaML/MLDatasets.jl)
 
@@ -101,8 +105,8 @@ where `MLDataset` adds the special word: `<eos>` to the end of `y`.
 
 #### UD English
 
-The [UD_English](https://github.com/UniversalDependencies/UD_English)
-dataset is an annotated corpus of morphological features,
+The [UD_English](https://github.com/UniversalDependencies/UD_English-EWT)
+Universal Dependencies English Web Treebank dataset is an annotated corpus of morphological features,
 POS-tags and syntactic trees. The dataset follows CoNLL-style
 format.
 

src/CIFAR10/CIFAR10.jl

@@ -59,7 +59,7 @@ module CIFAR10
 
     This function will display an interactive dialog unless
     either the keyword parameter `i_accept_the_terms_of_use` or
-    the environment variable `DATADEPS_ALWAY_ACCEPT` is set to
+    the environment variable `DATADEPS_ALWAYS_ACCEPT` is set to
     `true`. Note that using the data responsibly and respecting
     copyright/terms-of-use remains your responsibility.
     """

src/CIFAR100/CIFAR100.jl

@@ -47,7 +47,7 @@ module CIFAR100
 
     This function will display an interactive dialog unless
     either the keyword parameter `i_accept_the_terms_of_use` or
-    the environment variable `DATADEPS_ALWAY_ACCEPT` is set to
+    the environment variable `DATADEPS_ALWAYS_ACCEPT` is set to
     `true`. Note that using the data responsibly and respecting
     copyright/terms-of-use remains your responsibility.
     """

src/FashionMNIST/FashionMNIST.jl

@@ -80,7 +80,7 @@ module FashionMNIST
 
     This function will display an interactive dialog unless
     either the keyword parameter `i_accept_the_terms_of_use` or
-    the environment variable `DATADEPS_ALWAY_ACCEPT` is set to
+    the environment variable `DATADEPS_ALWAYS_ACCEPT` is set to
     `true`. Note that using the data responsibly and respecting
     copyright/terms-of-use remains your responsibility.
     """

src/MNIST/MNIST.jl

@@ -64,7 +64,7 @@ module MNIST
 
     This function will display an interactive dialog unless
     either the keyword parameter `i_accept_the_terms_of_use` or
-    the environment variable `DATADEPS_ALWAY_ACCEPT` is set to
+    the environment variable `DATADEPS_ALWAYS_ACCEPT` is set to
     `true`. Note that using the data responsibly and respecting
     copyright/terms-of-use remains your responsibility.
     """

src/UD_English/UD_English.jl

@@ -14,9 +14,9 @@ module UD_English
         download
 
     const DEPNAME = "UD_English"
-    const TRAINFILE = "en-ud-train.conllu"
-    const DEVFILE   = "en-ud-dev.conllu"
-    const TESTFILE  = "en-ud-test.conllu"
+    const TRAINFILE = "en_ewt-ud-train.conllu"
+    const DEVFILE   = "en_ewt-ud-dev.conllu"
+    const TESTFILE  = "en_ewt-ud-test.conllu"
 
     download(args...; kw...) = download_dep(DEPNAME, args...; kw...)
 
@@ -42,7 +42,7 @@ module UD_English
                      Marie-Catherine de Marneffe and Samuel
                      Bowman and Miriam Connor and John Bauer and
                      Christopher D. Manning
-            Website: https://github.com/UniversalDependencies/UD_English
+            Website: https://github.com/UniversalDependencies/UD_English-EWT
 
             A Gold Standard Universal Dependencies Corpus for
             English, built over the source material of the
@@ -70,7 +70,7 @@ module UD_English
             responsibility. Copyright and License is discussed in
             detail on the Website.
             """,
-            "https://raw.githubusercontent.com/UniversalDependencies/UD_English/master/" .* [TRAINFILE, DEVFILE, TESTFILE],
+            "https://raw.githubusercontent.com/UniversalDependencies/UD_English-EWT/master/" .* [TRAINFILE, DEVFILE, TESTFILE],
             "2311e260488453d5ba170cfd94e58ac4bd536263ea9545c7b25f0804e87b28a2",
         ))
     end

src/download.jl

@@ -3,11 +3,11 @@ using DataDeps
 
 function with_accept(f, manual_overwrite)
     auto_accept = if manual_overwrite == nothing
-        get(ENV, "DATADEPS_ALWAY_ACCEPT", false)
+        get(ENV, "DATADEPS_ALWAYS_ACCEPT", false)
     else
         manual_overwrite
     end
-    withenv(f, "DATADEPS_ALWAY_ACCEPT" => string(auto_accept))
+    withenv(f, "DATADEPS_ALWAYS_ACCEPT" => string(auto_accept))
 end
 
 function datadir(depname, dir = nothing; i_accept_the_terms_of_use = nothing)