NLTK support: Fix passing of multiple corpora identifiers (#460)

* NLTK support: Update test to use multiple corpora

So that the incorrect handling of multiple IDs seen in #444 would
have been caught.

Also switches to some of the smaller corpora, to reduce time spent
downloading during tests (see sizes on http://www.nltk.org/nltk_data/).

* NLTK support: Fix passing of multiple corpora identifiers

As part of fixing the shellcheck warnigns in #438, double quotes had
been placed around `$nltk_packages` passed to the `nltk.downloader`,
which causes multiple identifiers to be treated as though it were just
one identifier that contains spaces.

The docs for the shellcheck warning in question recommend using arrays
if the intended behaviour really is to split on spaces:
https://github.com/koalaman/shellcheck/wiki/SC2086#exceptions

As such, `readarray` has been used, which is present in bash >=4.
The `[*]` array form is used in the log message, to prevent shellcheck
warning SC2145, whereas `[@]` is used when passed to `nltk.downloader`
to ensure the array elements are unpacked as required.

Note: Both before and after this fix, using anything but unix line
endings in `nltk.txt` will also cause breakage.
This commit is contained in:
Ed Morley
2017-09-05 14:32:04 +01:00
committed by Kenneth Reitz
parent fd360bda14
commit 4212e06309
3 changed files with 6 additions and 6 deletions
+3 -4
View File
@@ -21,10 +21,10 @@ if sp-grep -s nltk; then
if [ -f "$nltk_packages_definition" ]; then
nltk_packages=$(tr "\n" " " < "$nltk_packages_definition")
puts-step "Downloading NLTK packages: $nltk_packages"
readarray -t nltk_packages < "$nltk_packages_definition"
puts-step "Downloading NLTK packages: ${nltk_packages[*]}"
python -m nltk.downloader -d "$BUILD_DIR/.heroku/python/nltk_data" "$nltk_packages" | indent
python -m nltk.downloader -d "$BUILD_DIR/.heroku/python/nltk_data" "${nltk_packages[@]}" | indent
set_env NLTK_DATA "/app/.heroku/python/nltk_data"
else
@@ -32,4 +32,3 @@ if sp-grep -s nltk; then
puts-warn "Learn more: https://devcenter.heroku.com/articles/python-nltk"
fi
fi
+2 -1
View File
@@ -1 +1,2 @@
wordnet
city_database
stopwords
+1 -1
View File
@@ -24,7 +24,7 @@ testGEOS() {
testNLTK() {
compile "nltk"
assertCaptured "wordnet"
assertCaptured "Downloading NLTK packages: city_database stopwords"
assertCapturedSuccess
}