From 87d4b24cfb7fb2ed10f33419632fda75fe5ab67c Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 11:33:05 -0500 Subject: [PATCH 01/12] Initial circle.yml --- circle.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..579f212 --- /dev/null +++ b/circle.yml @@ -0,0 +1,10 @@ +general: +machine: + python: + version: 3.5.0 +dependencies: + post: + - pip install requirements-dev.txt +test: + override: + - make test From 00b812eb979524ded0225be2737fbaab05d28ba5 Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 11:37:25 -0500 Subject: [PATCH 02/12] Add missing -r in pip install --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 579f212..6f0123a 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: version: 3.5.0 dependencies: post: - - pip install requirements-dev.txt + - pip install -r requirements-dev.txt test: override: - make test From 0e810a4aa62118a002a6a1685f4d9a9a4c1ba26c Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 11:42:25 -0500 Subject: [PATCH 03/12] Pass in pytest command manually --- circle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 6f0123a..34c558b 100644 --- a/circle.yml +++ b/circle.yml @@ -7,4 +7,6 @@ dependencies: - pip install -r requirements-dev.txt test: override: - - make test + - py.test --cov colombia tests/ + environment: + FLASK_CONFIG: ../conf/dev.py From 2680f6abd8b9270ebf7c2673e30cb7ca15e3dcae Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 11:45:21 -0500 Subject: [PATCH 04/12] Fix YAML syntax error --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 34c558b..e9682a1 100644 --- a/circle.yml +++ b/circle.yml @@ -7,6 +7,6 @@ dependencies: - pip install -r requirements-dev.txt test: override: - - py.test --cov colombia tests/ + - py.test --cov colombia tests/: environment: FLASK_CONFIG: ../conf/dev.py From 3ca3337f78061754f4297579fe222e11f5eb0d46 Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 12:03:57 -0500 Subject: [PATCH 05/12] Replace most of circle.yml test settings with more standard tox.ini --- circle.yml | 8 -------- tox.ini | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 tox.ini diff --git a/circle.yml b/circle.yml index e9682a1..c68bc96 100644 --- a/circle.yml +++ b/circle.yml @@ -2,11 +2,3 @@ general: machine: python: version: 3.5.0 -dependencies: - post: - - pip install -r requirements-dev.txt -test: - override: - - py.test --cov colombia tests/: - environment: - FLASK_CONFIG: ../conf/dev.py diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..61cd0ef --- /dev/null +++ b/tox.ini @@ -0,0 +1,9 @@ +[tox] +envlist = py34 +[testenv] +deps= + -rrequirements.txt + -rrequirements-dev.txt +setenv= + FLASK_CONFIG = ../conf/dev.py +commands=py.test --cov colombia tests/ From 079863fdeaf693719a105dcf1f2a50f72f192bec Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 12:06:32 -0500 Subject: [PATCH 06/12] Add a minimal setup.py --- circle.yml | 3 +++ setup.py | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 setup.py diff --git a/circle.yml b/circle.yml index c68bc96..d7cfbff 100644 --- a/circle.yml +++ b/circle.yml @@ -2,3 +2,6 @@ general: machine: python: version: 3.5.0 +test: + override: + - tox diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..b7769ed --- /dev/null +++ b/setup.py @@ -0,0 +1,6 @@ +from setuptools import setup + +setup(name='atlas-subnational-api', + url='http://github.com/cid-harvard/atlas-subnational-api/', + author='Flying Circus', + packages=['colombia']) From de49d50afbfd5b179183122d9e226c76022941be Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 12:09:41 -0500 Subject: [PATCH 07/12] Change CircleCI python version back down to 3.4 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index d7cfbff..bafbca1 100644 --- a/circle.yml +++ b/circle.yml @@ -1,7 +1,7 @@ general: machine: python: - version: 3.5.0 + version: 3.4.3 test: override: - tox From c8c07f004a5edbf0f1e0bc71d29e8c670c0ced29 Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 13:25:19 -0500 Subject: [PATCH 08/12] Revert "Change CircleCI python version back down to 3.4" This reverts commit de49d50afbfd5b179183122d9e226c76022941be. --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index bafbca1..d7cfbff 100644 --- a/circle.yml +++ b/circle.yml @@ -1,7 +1,7 @@ general: machine: python: - version: 3.4.3 + version: 3.5.0 test: override: - tox From f7472954b455f79fbbc864c97cc58ab4b877ebaf Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 13:25:30 -0500 Subject: [PATCH 09/12] Revert "Add a minimal setup.py" This reverts commit 079863fdeaf693719a105dcf1f2a50f72f192bec. --- circle.yml | 3 --- setup.py | 6 ------ 2 files changed, 9 deletions(-) delete mode 100644 setup.py diff --git a/circle.yml b/circle.yml index d7cfbff..c68bc96 100644 --- a/circle.yml +++ b/circle.yml @@ -2,6 +2,3 @@ general: machine: python: version: 3.5.0 -test: - override: - - tox diff --git a/setup.py b/setup.py deleted file mode 100644 index b7769ed..0000000 --- a/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -from setuptools import setup - -setup(name='atlas-subnational-api', - url='http://github.com/cid-harvard/atlas-subnational-api/', - author='Flying Circus', - packages=['colombia']) From 493b69601204072ac9b837286285173caee52e37 Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 13:25:43 -0500 Subject: [PATCH 10/12] Revert "Replace most of circle.yml test settings with more standard tox.ini" This reverts commit 3ca3337f78061754f4297579fe222e11f5eb0d46. --- circle.yml | 8 ++++++++ tox.ini | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 tox.ini diff --git a/circle.yml b/circle.yml index c68bc96..e9682a1 100644 --- a/circle.yml +++ b/circle.yml @@ -2,3 +2,11 @@ general: machine: python: version: 3.5.0 +dependencies: + post: + - pip install -r requirements-dev.txt +test: + override: + - py.test --cov colombia tests/: + environment: + FLASK_CONFIG: ../conf/dev.py diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 61cd0ef..0000000 --- a/tox.ini +++ /dev/null @@ -1,9 +0,0 @@ -[tox] -envlist = py34 -[testenv] -deps= - -rrequirements.txt - -rrequirements-dev.txt -setenv= - FLASK_CONFIG = ../conf/dev.py -commands=py.test --cov colombia tests/ From 647df2d32b95b31e91b8dfd24f9da465c29b87ee Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 13:29:17 -0500 Subject: [PATCH 11/12] Add coverage and junit xml reports for circleCI --- circle.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index e9682a1..398c12c 100644 --- a/circle.yml +++ b/circle.yml @@ -1,12 +1,16 @@ general: machine: python: - version: 3.5.0 + version: 3.4.3 +general: + artifacts: + - "htmlcov/" dependencies: post: - pip install -r requirements-dev.txt test: override: - - py.test --cov colombia tests/: + - mkdir -p $CIRCLE_TEST_REPORTS/junit + - py.test --cov colombia --cov-report html --junitxml=$CIRCLE_TEST_REPORTS/junit/results.xml tests/: environment: FLASK_CONFIG: ../conf/dev.py From e9a96a034dc8083200bbb5fa29663f22ca7d696e Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 1 Dec 2015 14:05:12 -0500 Subject: [PATCH 12/12] Add CircleCI badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ff5370b..d803912 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ The API backend for subnational atlas projects at Harvard CID. It's written in python and flask. [![Doc build status](https://readthedocs.org/projects/atlas-subnational-api/badge/?version=latest)](http://atlas-subnational-api.readthedocs.org/en/latest/) +[![Circle CI test build](https://circleci.com/gh/cid-harvard/atlas-subnational-api.svg?style=svg)](https://circleci.com/gh/cid-harvard/atlas-subnational-api) Documentation -------------