From 94c37f4584232eb7fd44d538eb19987cb69c648c Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 May 2015 12:28:24 +0300 Subject: [PATCH 1/6] Integrate Circle CI --- circle.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 00000000..b00ae634 --- /dev/null +++ b/circle.yml @@ -0,0 +1,16 @@ +machine: + python: + version: 2.7 + environment: + - TOX_ENV=docs + - TOX_ENV=lint + - TOX_ENV=py26 + - TOX_ENV=py27 + +dependencies: + pre: + - pip install tox + +test: + override: + - tox -e $TOX_ENV From e627a6ebdd92599374b531d6ecd9aeaa5b1c1e2e Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 May 2015 12:30:55 +0300 Subject: [PATCH 2/6] Fix environment --- circle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index b00ae634..fa03dd65 100644 --- a/circle.yml +++ b/circle.yml @@ -2,10 +2,10 @@ machine: python: version: 2.7 environment: - - TOX_ENV=docs - - TOX_ENV=lint - - TOX_ENV=py26 - - TOX_ENV=py27 + TOX_ENV: docs + TOX_ENV: lint + TOX_ENV: py26 + TOX_ENV: py27 dependencies: pre: From a120514e9e193dc22a4e37e2efa1a3ed7d1dd930 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 May 2015 12:35:25 +0300 Subject: [PATCH 3/6] Fix bottle requirement --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9b707761..3970b6b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ click==4.0 -bottle=0.12.8 +bottle==0.12.8 colorama==0.3.3 pyserial==2.7 requests==2.7.0 From af9cdd0694c9a9c85a832d317a60efde0f23dead Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 May 2015 12:38:21 +0300 Subject: [PATCH 4/6] Remove invalid PyPi SCons package --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3970b6b4..a38fcfee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,3 @@ bottle==0.12.8 colorama==0.3.3 pyserial==2.7 requests==2.7.0 -scons==2.3.0 From ef0ce3fc07861b146383207f92f5c59a8e48513e Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 May 2015 12:44:37 +0300 Subject: [PATCH 5/6] Update project submodules --- circle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/circle.yml b/circle.yml index fa03dd65..b0553fc8 100644 --- a/circle.yml +++ b/circle.yml @@ -7,6 +7,10 @@ machine: TOX_ENV: py26 TOX_ENV: py27 +checkout: + post: + - git submodule update --init + dependencies: pre: - pip install tox From 8d0785cf1b467057d835533b3285a82fb26dd39e Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 May 2015 13:10:36 +0300 Subject: [PATCH 6/6] Fix Circle CI Example --- docs/ci/circleci.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/ci/circleci.rst b/docs/ci/circleci.rst index 61da49de..daf7e674 100644 --- a/docs/ci/circleci.rst +++ b/docs/ci/circleci.rst @@ -30,9 +30,9 @@ Put ``circle.yml`` to the root directory of the GitHub repository. machine: environment: - - PLATFORMIO_CI_SRC=path/to/source/file.c - - PLATFORMIO_CI_SRC=path/to/source/file.ino - - PLATFORMIO_CI_SRC=path/to/source/directory + PLATFORMIO_CI_SRC: path/to/source/file.c + PLATFORMIO_CI_SRC: path/to/source/file.ino + PLATFORMIO_CI_SRC: path/to/source/directory dependencies: pre: