Merge branch 'issue223-docdir-sort'

NatLibFi · Dec 6, 2018 · 4429e2f · 4429e2f
2 parents 4f598c4 + 73bdb15
commit 4429e2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ python:
 - '3.5'
 - '3.6'
 cache: pip
+before_install:
+- export BOTO_CONFIG=/dev/null
 install:
 - pip install pipenv
 - pip install --upgrade pytest

diff --git a/annif/corpus/document.py b/annif/corpus/document.py
@@ -22,7 +22,7 @@ def __iter__(self):
         subjectfile) containing file paths. If there is no key file and
         require_subjects is False, the subjectfile will be returned as None."""
 
-        for filename in glob.glob(os.path.join(self.path, '*.txt')):
+        for filename in sorted(glob.glob(os.path.join(self.path, '*.txt'))):
             tsvfilename = re.sub(r'\.txt$', '.tsv', filename)
             if os.path.exists(tsvfilename):
                 yield (filename, tsvfilename)