From 8fcedf52ade151cbabe2fc94db9dfa007170c0ca Mon Sep 17 00:00:00 2001
From: Erik Nyquist <eknyquist@gmail.com>
Date: Tue, 10 Oct 2017 21:46:32 -0700
Subject: [PATCH] Final fixes for .travis.yml, appveyor.yml

---
 .travis.yml         | 22 ++++++++++-----
 appveyor.yml        | 66 +++++----------------------------------------
 pyrxvm/test/test.py |  7 +++++
 3 files changed, 28 insertions(+), 67 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7dfb5a0..4587f6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,27 @@
 language: c
 
-os:
-  - linux
-  - osx
-
 compiler:
   - gcc
 
-python:
-  - "2.7"
+matrix:
+  include:
+  - python: "2.7"
+    os: linux
+  - python: "2.7"
+    os: osx
+  - python: "2.6"
+    os: osx
+  - python: "2.5"
+    os: osx
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pip; pip install wheel; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; sudo apt-get install -qq python-pip; sudo pip install wheel; fi
 
+after_install:
+  - ls pyrxvm/dist
+  - echo $python
+
 script:
 # Build C lib
   - ./autogen.sh
@@ -27,7 +35,7 @@ script:
   - python setup.py build
   - python setup.py bdist_wheel
   - sudo pip install . --upgrade
-  - python setup.py test
+  - python pyrxvm/test/test.py
 
 deploy:
   provider: releases
diff --git a/appveyor.yml b/appveyor.yml
index e222b22..44b9e70 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,10 +6,6 @@ environment:
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
 
   matrix:
-    # Pre-installed Python versions, which Appveyor may upgrade to
-    # a later point release.
-    # See: http://www.appveyor.com/docs/installed-software#python
-
     - PYTHON: "C:\\Python27"
       PYTHON_VERSION: "2.7.x" # currently 2.7.9
       PYTHON_ARCH: "32"
@@ -18,61 +14,12 @@ environment:
       PYTHON_VERSION: "2.7.x" # currently 2.7.9
       PYTHON_ARCH: "64"
 
-    - PYTHON: "C:\\Python270"
-      PYTHON_VERSION: "2.7.0"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python270-x64"
-      PYTHON_VERSION: "2.7.0"
-      PYTHON_ARCH: "64"
-
-
-    - PYTHON: "C:\\Python27.14"
-      PYTHON_VERSION: "2.7.14"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27.14-x64"
-      PYTHON_VERSION: "2.7.14"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python27.13"
-      PYTHON_VERSION: "2.7.13"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27.13-x64"
-      PYTHON_VERSION: "2.7.13"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python27.12"
-      PYTHON_VERSION: "2.7.12"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27.12-x64"
-      PYTHON_VERSION: "2.7.12"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python27.11"
-      PYTHON_VERSION: "2.7.11"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27.11-x64"
-      PYTHON_VERSION: "2.7.11"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python27.10"
-      PYTHON_VERSION: "2.7.10"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27.10-x64"
-      PYTHON_VERSION: "2.7.10"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python27.9"
-      PYTHON_VERSION: "2.7.9"
+    - PYTHON: "C:\\Python26"
+      PYTHON_VERSION: "2.6.x" # currently 2.7.9
       PYTHON_ARCH: "32"
 
-    - PYTHON: "C:\\Python27.9-x64"
-      PYTHON_VERSION: "2.7.9"
+    - PYTHON: "C:\\Python26-x64"
+      PYTHON_VERSION: "2.6.x" # currently 2.7.9
       PYTHON_ARCH: "64"
 
 install:
@@ -101,18 +48,17 @@ test_script:
   # Build extension
   - "%CMD_IN_ENV% python setup.py build"
   - "%CMD_IN_ENV% pip install . --upgrade"
-  - "%CMD_IN_ENV% python setup.py test"
+  - "%CMD_IN_ENV% python pyrxvm/test/test.py"
 
 after_test:
   # If tests are successful, create binary packages for the project.
   - "%CMD_IN_ENV% python setup.py bdist_wheel"
   - "%CMD_IN_ENV% python setup.py bdist_wininst"
   - "%CMD_IN_ENV% python setup.py bdist_msi"
-  - "move \"pyrxvm/dist\" \"python_%PYTHON_VERSION%_%PYTHON_ARCH%\""
 
 artifacts:
   # Archive the generated packages in the ci.appveyor.com build report.
-  - path: python_$(PYTHON_VERSION)_$(PYTHON_ARCH)\*
+  - path: pyrxvm/dist/*
 
 #on_success:
 #  - TODO: upload the content of dist/*.whl to a public wheelhouse
diff --git a/pyrxvm/test/test.py b/pyrxvm/test/test.py
index 6344340..9948a0c 100644
--- a/pyrxvm/test/test.py
+++ b/pyrxvm/test/test.py
@@ -93,3 +93,10 @@ def test_match(self):
         self.assertTrue(p.match("azbc"))
         self.assertTrue(p.match("azzzzzbcc"))
         self.assertFalse(p.match("ab"))
+
+def main():
+    suite = unittest.TestLoader().loadTestsFromTestCase(RXVMTest)
+    unittest.TextTestRunner(verbosity=2).run(suite)
+
+if __name__ == '__main__':
+    main()