Merge pull request #84 from abstractfactory/master

AppVeyor support

Author: mottosso

appveyor.yml

@@ -0,0 +1,34 @@
+build: false
+
+environment:
+  matrix:
+    - PYTHON: "C:\\Python27-x64"
+      PYQT: "http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.4/PyQt4-4.11.4-gpl-Py2.7-Qt4.8.7-x64.exe"
+
+    # - PYTHON: "C:\\Python34-x64"
+    #   PYQT: "http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.4/PyQt4-4.11.4-gpl-Py3.4-Qt4.8.7-x64.exe"
+
+init:
+  - ECHO %PYTHON%
+  - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
+
+install:
+  # Install PySide
+  - python -m pip install nose nosepipe PySide
+
+  # Install PyQt4
+  # miniconda (provided by AppVeyor) prevents PyQt installer
+  # to run because of a registry key. So the line below overwrite
+  # the registry key.
+
+  - REG ADD HKCU\Software\Python\PythonCore\2.7\InstallPath /f /ve /t REG_SZ /d %PYTHON%
+  - ps: (new-object net.webclient).DownloadFile($env:PYQT, "C:\install-PyQt4.exe")
+  - ps: Start-Process -FilePath C:\install-PyQt4.exe -ArgumentList "/S" -Wait -Passthru
+
+  # Test install
+  - python -c "from PyQt4 import QtGui"
+  - python -c "from PySide import QtGui"
+
+test_script:
+  - python build_caveats_tests.py
+  - nosetests --verbose --with-doctest --with-process-isolation --exe

build_caveats_tests.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
-import parser
+import caveats
 
-blocks = parser.parse("CAVEATS.md")
-tests = parser.format_(blocks)
+blocks = caveats.parse("CAVEATS.md")
+tests = caveats.format_(blocks)
 
 # Write formatted tests
 with open("test_caveats.py", "w") as f:

parser.py caveats.pyparser.py renamed to caveats.py

@@ -21,7 +21,7 @@ def parse(fname):
             # Doctests are within a quadruple hashtag header.
             if line.startswith("#### "):
                 current_header = line.rstrip()
-                
+
             # The actuat test is within a fenced block.
             if line.startswith("```"):
                 in_block = False
@@ -38,9 +38,9 @@ def parse(fname):
     tests = list()
     for block in blocks:
         header = (
-            block[0].strip("# ") # Remove Markdown
-                    .rstrip()    # Remove newline
-                    .lower()     # PEP08
+            block[0].strip("# ")  # Remove Markdown
+                    .rstrip()     # Remove newline
+                    .lower()      # PEP08
         )
 
         # Remove unsupported characters
@@ -59,7 +59,7 @@ def parse(fname):
         )
 
         binding, doctest_version = (data + [None])[:2]
-        
+
         # Run tests on both Python 2 and 3, unless explicitly stated
         if doctest_version is not None:
             if doctest_version not in ("Python2", "Python3"):
@@ -83,7 +83,7 @@ def parse(fname):
 
 def format_(blocks):
     """Produce Python module from blocks of tests
-    
+
     Arguments:
         blocks (list): Blocks of tests from func:`parse()`
 
@@ -122,5 +122,5 @@ def test_{count}_{header}():
     '''
 
     """.format(**block))
-    
+
     return tests

tests.py

@@ -19,6 +19,16 @@
 
 PYTHON = sys.version_info[0]  # e.g. 2 or 3
 
+self = sys.modules[__name__]
+
+
+def setup():
+    self.tempdir = tempfile.mkdtemp()
+
+
+def teardown():
+    shutil.rmtree(self.tempdir)
+
 
 @contextlib.contextmanager
 def pyqt4():
@@ -123,53 +133,50 @@ def test_vendoring():
 
     project/
         vendor/
-        __init__.py
             __init__.py
+        __init__.py
 
     """
 
-    dirname = os.path.dirname(__file__)
-    tempdir = tempfile.mkdtemp()
-
-    try:
-        project = os.path.join(tempdir, "myproject")
-        vendor = os.path.join(tempdir, "myproject", "vendor")
-
-        os.makedirs(vendor)
-
-        # Make packages out of folders
-        with open(os.path.join(project, "__init__.py"), "w") as f:
-            f.write("from .vendor.Qt import QtWidgets")
-
-        with open(os.path.join(vendor, "__init__.py"), "w") as f:
-            pass
-
-        shutil.copy(os.path.join(dirname, "Qt.py"),
-                    os.path.join(vendor, "Qt.py"))
-
-        print("Testing relative import..")
-        assert subprocess.call(
-            ["python", "-c", "import myproject"],
-            cwd=tempdir,
-            env={}
-        ) == 0
-
-        print("Testing absolute import..")
-        assert subprocess.call(
-            ["python", "-c", "from myproject.vendor.Qt import QtWidgets"],
-            cwd=tempdir,
-            env={}
-        ) == 0
-
-        print("Testing direct import..")
-        assert subprocess.call(
-            ["python", "-c", "import myproject.vendor.Qt"],
-            cwd=tempdir,
-            env={}
-        ) == 0
-
-    finally:
-        shutil.rmtree(tempdir)
+    project = os.path.join(self.tempdir, "myproject")
+    vendor = os.path.join(project, "vendor")
+
+    os.makedirs(vendor)
+
+    # Make packages out of folders
+    with open(os.path.join(project, "__init__.py"), "w") as f:
+        f.write("from .vendor.Qt import QtWidgets")
+
+    with open(os.path.join(vendor, "__init__.py"), "w") as f:
+        f.write("\n")
+
+    # Copy real Qt.py into myproject
+    shutil.copy(os.path.join(os.path.dirname(__file__), "Qt.py"),
+                os.path.join(vendor, "Qt.py"))
+
+    print("Testing relative import..")
+    assert subprocess.call(
+        ["python", "-c", "import myproject"],
+        cwd=self.tempdir,
+        stdout=subprocess.PIPE,    # With nose process isolation, buffer can
+        stderr=subprocess.STDOUT,  # easily get full and throw an error.
+    ) == 0
+
+    print("Testing absolute import..")
+    assert subprocess.call(
+        ["python", "-c", "from myproject.vendor.Qt import QtWidgets"],
+        cwd=self.tempdir,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+    ) == 0
+
+    print("Testing direct import..")
+    assert subprocess.call(
+        ["python", "-c", "import myproject.vendor.Qt"],
+        cwd=self.tempdir,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+    ) == 0
 
 
 if PYTHON == 2: