Merge pull request #212 from CLARIAH/dev

Dev changes -- CI testing under windows

.travis.yml

@@ -21,6 +21,10 @@ jobs:
       language: objective-c
       env: PYENV_VERSION=3.5.2
       # command to install dependencies
+    - stage: Tests
+      os: windows
+      language: shell
+      env: PATH=/c/Python37:/c/Python37/Scripts:$PATH
     - stage: deploy
       # deploy automatically to pypi
       before_deploy:

.travis/before_install.sh

@@ -10,4 +10,6 @@ fi
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
   brew install pyenv
   pyenv install -s $PYENV_VERSION
+elif [[ $TRAVIS_OS_NAME == 'windows' ]]; then
+  choco install python
 fi

.travis/install.sh

@@ -9,6 +9,8 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
     alias pip=pip3
   fi
   export PATH="/Users/travis/.pyenv/shims:${PATH}"
+elif [[ $TRAVIS_OS_NAME == 'windows' ]]; then
+  alias pip="pip --user"
 fi
 
 if [[ $TRAVIS_BUILD_STAGE_NAME == 'Deploy' ]]; then

setup.py

@@ -21,7 +21,7 @@
 with codecs.open('requirements-test.txt', mode='r') as f:
     tests_require = f.read().splitlines()
 
-with codecs.open('README.md', mode='r') as f:
+with codecs.open('README.md', mode='r', encoding='utf-8') as f:
     long_description = f.read()
 
 setup(

src/fileLoaders.py

@@ -58,7 +58,7 @@ def __init__(self, user, repo, sha, prov):
             self.gh_repo = gh.get_repo(user + '/' + repo, lazy=False)
         except BadCredentialsException:
             raise Exception('BadCredentials: have you set up github_access_token on config.ini ?')
-        except Exception as e:
+        except Exception:
             raise Exception('Repo not found: ' + user + '/' + repo)
 
     def fetchFiles(self):
@@ -124,12 +124,11 @@ def __init__(self, baseDir=static.LOCAL_SPARQL_DIR):
 
     def fetchFiles(self):
         """Returns a list of file items contained on the local repo."""
-        print("Fetching files from {}".format(self.baseDir))
         files = glob(path.join(self.baseDir, '*'))
         filesDef = []
+        baseDirSlash = path.join(self.baseDir, '')
         for f in files:
-            print("Found SPARQL file {}".format(f))
-            relative = f.replace(self.baseDir, '')
+            relative = f.replace(baseDirSlash, '')
             filesDef.append({
                 'download_url': relative,
                 'name': relative
@@ -145,7 +144,7 @@ def getTextFor(self, fileItem):
         return self._getText(fileItem['download_url'])
 
     def _getText(self, filename):
-        targetFile = self.baseDir + filename
+        targetFile = path.join(self.baseDir, filename)
         if path.exists(targetFile):
             with open(targetFile, 'r') as f:
                 lines = f.readlines()

tests/mock_data.py

@@ -2,7 +2,7 @@
 from os import path
 from glob import glob
 
-base_url = 'tests/repo/'
+base_url = path.join('tests', 'repo')
 def buildEntry(entryName):
     entryName = entryName.replace(base_url, '')
     return {
@@ -11,15 +11,15 @@ def buildEntry(entryName):
          u'path': entryName,
          u'type': u'file'
     }
-mock_files = [ buildEntry(f) for f in glob(base_url + '*') ]
+mock_files = [ buildEntry(f) for f in glob(path.join(base_url, '*')) ]
 
 def mock_requestsGithub(uri, headers={}, params={}):
     if uri.endswith('contents'):
         return_value = Mock(ok=True)
         return_value.json.return_value = mock_files
         return return_value
     else:
-        targetFile = uri.replace('https://raw.githubusercontent.com/fakeuser/fakerepo/master/', base_url)
+        targetFile = uri.replace('https://raw.githubusercontent.com/fakeuser/fakerepo/master/', path.join(base_url, ''))
         if path.exists(targetFile):
             f = open(targetFile, 'r')
             lines = f.readlines()

tests/test_loaders.py

@@ -1,6 +1,7 @@
 import unittest
 import six
 from mock import patch
+from os import path
 
 from grlc.fileLoaders import LocalLoader, GithubLoader
 from grlc.queryTypes import qType
@@ -77,7 +78,7 @@ def test_getTextForName(self):
 class TestLocalLoader(unittest.TestCase):
     @classmethod
     def setUpClass(self):
-        self.loader = LocalLoader('./tests/repo/')
+        self.loader = LocalLoader(path.join('tests', 'repo'))
 
     def test_fetchFiles(self):
         files = self.loader.fetchFiles()