From 66a028db52228c5a37c1e89695b7e4cf9c28b59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=CC=8Avard=20Gulldahl?= <havard@gulldahl.no>
Date: Wed, 31 Aug 2016 20:43:25 +0200
Subject: [PATCH] fix appveyor

---
 appveyor.yml               | 17 ++++++++++++-----
 tests/requirements.win.txt |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6ef9b68..30f89cd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,13 +3,17 @@ build: false
 
 environment:
   matrix:
-    - PYTHON: "C:/Python27"
+    - PYTHON: "C:/Python27" # this is win32
       LXML: "tests/contrib/lxml-3.6.4-cp27-cp27m-win32.whl"
+      #PY2EXE: py2exe_py2
       REQUIREMENTS: "tests/requirements.win.txt"
     - PYTHON: "C:/Python35"
       LXML: "tests/contrib/lxml-3.6.4-cp35-cp35m-win32.whl"
+      #PY2EXE: "py2exe
       REQUIREMENTS: "tests/requirements.win.txt"
-
+    #- PYTHON: "C:\\Python27-x64" #TODO: enable x64 build
+    #  PYTHON_VERSION: "2.7.x" # currently 2.7.9
+    #  PYTHON_ARCH: "64"
 init:
   - "ECHO %PYTHON%"
   - "ECHO %LXML%"
@@ -22,9 +26,12 @@ install:
   - "%PYTHON%/python.exe c:/ez_setup.py > NUL"
   - "%PYTHON%/python.exe c:/get-pip.py"
   - "%PYTHON%/Scripts/pip.exe install %LXML%"
+  - "%PYTHON%/Scripts/pip.exe install %PY2EXE%"
   - "%PYTHON%/Scripts/pip.exe -q install -r %REQUIREMENTS%"
-  - set PYTHONPATH=%PYTHONPATH%;tests
+  - "%PYTHON%/Scripts/pip.exe install ." # install jottalib
+  #- git clone https://github.com/havardgulldahl/jottalib
+  - set PYTHONPATH=%PYTHONPATH%;tests;%CD%\tests"
 
 test_script:
-  - ls 
-  - "%PYTHON%/Scripts/py.test tests"
\ No newline at end of file
+  - echo "PYTHONPATH=%PYTHONPATH%"
+  - "%PYTHON%/Scripts/py.test tests"
diff --git a/tests/requirements.win.txt b/tests/requirements.win.txt
index 2a32bad..6107b49 100644
--- a/tests/requirements.win.txt
+++ b/tests/requirements.win.txt
@@ -18,3 +18,4 @@ watchdog
 
 # test environment
 pytest
+