Skip to content

Commit

Permalink
Merge pull request #263 from yanokwa/circleci
Browse files Browse the repository at this point in the history
Enable CircleCI support, remove Travis
  • Loading branch information
ukanga authored Feb 19, 2019
2 parents 3b236f1 + 436ef44 commit 13d9bce
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 21 deletions.
54 changes: 54 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -26,10 +27,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

Expand All @@ -50,4 +51,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.

0 comments on commit 13d9bce

Please sign in to comment.