From a4bd98d0b0d838cb563b2abde89245caac934903 Mon Sep 17 00:00:00 2001
From: Yaw Anokwa <yanokwa@gmail.com>
Date: Mon, 11 Feb 2019 15:38:17 -0800
Subject: [PATCH 1/4] Enable CircleCI support

---
 .circleci/config.yml | 54 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..7103a7f9d
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,54 @@
+version: 2
+jobs:
+  py-3.7: &build-template
+    docker:
+      - image: circleci/python:3.7
+    working_directory: ~/work
+    steps:
+      - checkout
+      - restore_cache:
+          key: requirements-{{ checksum "requirements.pip" }}
+      - run:
+          # Install dependencies with --user to enable easier caching
+          name: Install dependencies
+          command: pip install -r requirements.pip --user
+      - run:
+          # Validate calls GUI code which fails if assistive_technologies are on
+          name: Install dependencies for ODK Validate
+          command: |
+            sudo apt-get install -y openjdk-8-jre-headless
+            sudo sed -i -e '/^assistive_technologies=/s/^/#/' /etc/java-*-openjdk/accessibility.properties
+      - run:
+          name: Run tests
+          command: |
+            /home/circleci/.local/bin/nosetests
+            /home/circleci/.local/bin/nosetests --tests pyxform/tests_v1/
+      - save_cache:
+          key: requirements-{{ checksum "requirements.pip" }}
+          paths:
+            - /home/circleci/.local/lib
+  py-3.6:
+    <<: *build-template
+    docker:
+      - image: circleci/python:3.6
+  py-3.5:
+    <<: *build-template
+    docker:
+      - image: circleci/python:3.5
+  py-3.4:
+    <<: *build-template
+    docker:
+      - image: circleci/python:3.4
+  py-2.7:
+    <<: *build-template
+    docker:
+      - image: circleci/python:2.7
+workflows:
+  version: 2
+  build:
+    jobs:
+      - py-3.7
+      - py-3.6
+      - py-3.5
+      - py-3.4
+      - py-2.7
\ No newline at end of file

From 31335c5c2a93c12ee7297e78439efc17e2de6771 Mon Sep 17 00:00:00 2001
From: Yaw Anokwa <yanokwa@gmail.com>
Date: Mon, 11 Feb 2019 16:42:29 -0800
Subject: [PATCH 2/4] Remove Travis support

---
 .travis.yml  | 14 --------------
 appveyor.yml |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5f84c80eb..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: python
-python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
-install:
-  - pip install -U pip setuptools
-  - pip install -q -r requirements.pip
-env:
-  - "RUNTESTS=nosetests"
-  - "RUNTESTS='nosetests --tests pyxform/tests_v1/'"
-script: python setup.py $RUNTESTS
-notifications:
-  irc: "irc.freenode.org#moditest"
diff --git a/appveyor.yml b/appveyor.yml
index f78ae89bf..5c6df8d0b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,10 +26,10 @@ install:
 
   # Upgrade to the latest version of pip to avoid it displaying warnings
   # about it being out of date.
-  - ps: python  -Wignore -m pip install -U pip setuptools
+  - ps: python -Wignore -m pip install -U pip setuptools
 
   # We need wheel installed to build wheels
-  - ps: python -Wignore -m  pip  install wheel
+  - ps: python -Wignore -m pip install wheel
 
   - ps: python -Wignore -m pip install -q -r requirements.pip
 
@@ -50,4 +50,4 @@ artifacts:
 #on_success:
 #  You can use this step to upload your artifacts to a public website.
 #  See Appveyor's documentation for more details. Or you can simply
-#  access your wheels from the Appveyor "artifacts" tab for your build.
+#  access your wheels from the Appveyor "artifacts" tab for your build.
\ No newline at end of file

From 6d6cfe1fd3915da789b7327eb6b9844b253d12a0 Mon Sep 17 00:00:00 2001
From: Yaw Anokwa <yanokwa@gmail.com>
Date: Mon, 11 Feb 2019 16:44:16 -0800
Subject: [PATCH 3/4] Update badge

---
 README.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index dc7760582..578e52e6c 100644
--- a/README.rst
+++ b/README.rst
@@ -2,10 +2,10 @@
 pyxform v0.12
 =============
 
-|travis|  |appveyor|
+|circleci|  |appveyor|
 
-.. |travis| image:: https://travis-ci.org/XLSForm/pyxform.svg?branch=master
-    :target: https://travis-ci.org/XLSForm/pyxform
+.. |circleci| image:: https://circleci.com/gh/XLSForm/pyxform.svg?style=shield&circle-token=:circle-token
+    :target: https://circleci.com/gh/XLSForm/pyxform
 
 .. |appveyor| image:: https://ci.appveyor.com/api/projects/status/github/XLSForm/pyxform?branch=master&svg=true
     :target: https://ci.appveyor.com/project/ukanga/pyxform

From 436ef44ed8c30dd4dac862a393a019283d692855 Mon Sep 17 00:00:00 2001
From: Yaw Anokwa <yanokwa@gmail.com>
Date: Fri, 15 Feb 2019 12:56:20 -0800
Subject: [PATCH 4/4] Add Python 3.7 support, cleaner yml

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5c6df8d0b..76291bd8c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,11 +11,12 @@ environment:
     - PYTHON: "C:\\Python34"
     - PYTHON: "C:\\Python35"
     - PYTHON: "C:\\Python36"
+    - PYTHON: "C:\\Python37"
     - PYTHON: "C:\\Python27-x64"
     - PYTHON: "C:\\Python34-x64"
-      DISTUTILS_USE_SDK: "1"
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36-x64"
+    - PYTHON: "C:\\Python37-x64"
 
 install:
   - ps: $env:Path = "$env:PYTHON;$env:PYTHON\Scripts;$env:Path"