Merge branch 'python3' of https://github.com/renshawbay/pythonnet_new into python3

tonyroberts · tonyroberts · commit 6963b1221fb4 · 2014-11-06T15:50:10.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,8 @@ language: python
 python:
   - 2.6
   - 2.7
+  - 3.2
+  - 3.4
 before_install:
   - sudo apt-get install software-properties-common
   - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"
@@ -12,7 +14,9 @@ before_install:
   - yes | sudo certmgr -ssl -m https://nugetgallery.blob.core.windows.net
   - yes | sudo certmgr -ssl -m https://nuget.org
 install:
+  - pip install six
   - python setup.py build_ext --inplace
 script:
   - export PYTHONPATH=`pwd`
+  - export PYTHONHOME=`python -c "import sys; print(sys.exec_prefix)"`
   - ./npython src/tests/runtests.py
diff --git a/appveyor.yml b/appveyor.yml
@@ -23,6 +23,7 @@ install:
   - set PATH=C:\Python;%PATH%
   - C:\Python\python.exe c:\get-pip.py
   - C:\Python\Scripts\pip.exe install wheel
+  - C:\Python\Scripts\pip.exe install six
 
 build_script:
   - C:\python\python.exe setup.py bdist_wheel
