From 8a546bc7190694db576483843f2d930604e01937 Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Sat, 25 Mar 2017 01:39:08 -0400 Subject: [PATCH 01/12] circle.yml attemt --- circle.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..2285c51 --- /dev/null +++ b/circle.yml @@ -0,0 +1,27 @@ +# Controls the build environment +machine: + python: + version: 3.5.2 + environment: + PATH: /home/ubuntu/miniconda3/bin:$PATH + +dependencies: + override: + # Moving to nilearn directory before performing the installation. + - apt-get install -y python-numpy + - apt-get install -y python-scipy + - apt-get install -y libjpeg-dev zlib1g libtiff5-dev libfreetype6-dev libwebp-dev libopenjpeg-dev + - pip install Pillow + - apt-get install -y gdal-bin python-gdal + - apt-get install -y libopencv-dev python-opencv + - apt-get install -y libspatialindex-dev + - pip install rtree + + +# Set up the commands to run as a test (override), as well as the commands to +# run before (pre) and after (post). +test: + pre: + - mkdir -p $CIRCLE_TEST_REPORTS/junit/ + override: + - cd /home/ubuntu/utilities/python; python from spaceNetUtilities import geoTools as gT; \ No newline at end of file From c96895ec65f7fddf26cab969c3fd84299ff46001 Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Sat, 25 Mar 2017 01:42:17 -0400 Subject: [PATCH 02/12] circle.yml attemt2 --- circle.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/circle.yml b/circle.yml index 2285c51..476b8fc 100644 --- a/circle.yml +++ b/circle.yml @@ -8,14 +8,14 @@ machine: dependencies: override: # Moving to nilearn directory before performing the installation. - - apt-get install -y python-numpy - - apt-get install -y python-scipy - - apt-get install -y libjpeg-dev zlib1g libtiff5-dev libfreetype6-dev libwebp-dev libopenjpeg-dev - - pip install Pillow - - apt-get install -y gdal-bin python-gdal - - apt-get install -y libopencv-dev python-opencv - - apt-get install -y libspatialindex-dev - - pip install rtree + - sudo apt-get install -y python-numpy + - sudo apt-get install -y python-scipy + - sudo apt-get install -y libjpeg-dev zlib1g libtiff5-dev libfreetype6-dev libwebp-dev libopenjpeg-dev + - sudo pip install Pillow + - sudo apt-get install -y gdal-bin python-gdal + - sudo apt-get install -y libopencv-dev python-opencv + - sudo apt-get install -y libspatialindex-dev + - sudo pip install rtree # Set up the commands to run as a test (override), as well as the commands to From 18d71a38a33ab5e642955cda963a07635fb36239 Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Sat, 25 Mar 2017 01:44:43 -0400 Subject: [PATCH 03/12] circle.yml attemt3 --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 476b8fc..c03b5fc 100644 --- a/circle.yml +++ b/circle.yml @@ -8,6 +8,7 @@ machine: dependencies: override: # Moving to nilearn directory before performing the installation. + - apt-get update - sudo apt-get install -y python-numpy - sudo apt-get install -y python-scipy - sudo apt-get install -y libjpeg-dev zlib1g libtiff5-dev libfreetype6-dev libwebp-dev libopenjpeg-dev From 42ac9cd1b658e8a91791b1d62f841c01db01355f Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Sat, 25 Mar 2017 01:46:48 -0400 Subject: [PATCH 04/12] circle.yml attemt4 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index c03b5fc..bdd346b 100644 --- a/circle.yml +++ b/circle.yml @@ -8,7 +8,7 @@ machine: dependencies: override: # Moving to nilearn directory before performing the installation. - - apt-get update + - sudo apt-get update - sudo apt-get install -y python-numpy - sudo apt-get install -y python-scipy - sudo apt-get install -y libjpeg-dev zlib1g libtiff5-dev libfreetype6-dev libwebp-dev libopenjpeg-dev From 9e77f69ecaddca27b198a621996913d68e04fa90 Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Sat, 25 Mar 2017 01:56:13 -0400 Subject: [PATCH 05/12] added python/test.py to do import test --- circle.yml | 2 +- python/test.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 python/test.py diff --git a/circle.yml b/circle.yml index bdd346b..2673846 100644 --- a/circle.yml +++ b/circle.yml @@ -25,4 +25,4 @@ test: pre: - mkdir -p $CIRCLE_TEST_REPORTS/junit/ override: - - cd /home/ubuntu/utilities/python; python from spaceNetUtilities import geoTools as gT; \ No newline at end of file + - cd /home/ubuntu/utilities/python; python test.py \ No newline at end of file diff --git a/python/test.py b/python/test.py new file mode 100644 index 0000000..016109d --- /dev/null +++ b/python/test.py @@ -0,0 +1,4 @@ +from spaceNetUtilities import geoTools as gT +from spaceNetUtilities import labelTools as lT +from spaceNetUtilities import dataTools as dT +from spaceNetUtilities import evalTools as lT \ No newline at end of file From 1ca263c492bf1006e6cd8b961c1262244f7248c7 Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Mon, 15 May 2017 14:00:43 -0400 Subject: [PATCH 06/12] update circle.yml attempting to install gdal into virtualenv --- circle.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index 2673846..a2f9247 100644 --- a/circle.yml +++ b/circle.yml @@ -1,7 +1,7 @@ # Controls the build environment machine: python: - version: 3.5.2 + version: 2.7.12 environment: PATH: /home/ubuntu/miniconda3/bin:$PATH @@ -13,11 +13,12 @@ dependencies: - sudo apt-get install -y python-scipy - sudo apt-get install -y libjpeg-dev zlib1g libtiff5-dev libfreetype6-dev libwebp-dev libopenjpeg-dev - sudo pip install Pillow - - sudo apt-get install -y gdal-bin python-gdal + - sudo apt-get install -y gdal-bin - sudo apt-get install -y libopencv-dev python-opencv - sudo apt-get install -y libspatialindex-dev - - sudo pip install rtree - + - sudo apt-get install -y libgdal1-dev + - sudo pip install rtree numpy scipy + - sudo pip install pygdal>=1.10.1.0,<=1.10.1.999 # Set up the commands to run as a test (override), as well as the commands to # run before (pre) and after (post). @@ -25,4 +26,4 @@ test: pre: - mkdir -p $CIRCLE_TEST_REPORTS/junit/ override: - - cd /home/ubuntu/utilities/python; python test.py \ No newline at end of file + - cd /home/ubuntu/utilities/python; python test.py From ce2f5c8851f38ba235a28d2f0101e7be50d9d4d1 Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Mon, 15 May 2017 15:15:12 -0400 Subject: [PATCH 07/12] Update circle.yml --- circle.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/circle.yml b/circle.yml index a2f9247..650e8a6 100644 --- a/circle.yml +++ b/circle.yml @@ -1,24 +1,18 @@ # Controls the build environment machine: - python: - version: 2.7.12 - environment: - PATH: /home/ubuntu/miniconda3/bin:$PATH - + dependencies: - override: + pre: # Moving to nilearn directory before performing the installation. - sudo apt-get update - sudo apt-get install -y python-numpy - sudo apt-get install -y python-scipy - sudo apt-get install -y libjpeg-dev zlib1g libtiff5-dev libfreetype6-dev libwebp-dev libopenjpeg-dev - sudo pip install Pillow - - sudo apt-get install -y gdal-bin + - sudo apt-get install -y gdal-bin python-gdal - sudo apt-get install -y libopencv-dev python-opencv - sudo apt-get install -y libspatialindex-dev - - sudo apt-get install -y libgdal1-dev - sudo pip install rtree numpy scipy - - sudo pip install pygdal>=1.10.1.0,<=1.10.1.999 # Set up the commands to run as a test (override), as well as the commands to # run before (pre) and after (post). From 0d6fa37a56a07bb1a6f91dde9ccd92e8db95dbac Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Mon, 15 May 2017 15:17:26 -0400 Subject: [PATCH 08/12] Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 650e8a6..0422e09 100644 --- a/circle.yml +++ b/circle.yml @@ -2,7 +2,7 @@ machine: dependencies: - pre: + override: # Moving to nilearn directory before performing the installation. - sudo apt-get update - sudo apt-get install -y python-numpy From d36173651d1cdda240eabbc3e5c9b90ff7f47ca9 Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Mon, 15 May 2017 15:20:32 -0400 Subject: [PATCH 09/12] Update circle.yml --- circle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 0422e09..9eb6cf2 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,8 @@ # Controls the build environment machine: - + python: + version: 2.7.5 + dependencies: override: # Moving to nilearn directory before performing the installation. From dc311a3f8864e8b8b54f015b4723144057d2c6d9 Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Mon, 15 May 2017 15:54:47 -0400 Subject: [PATCH 10/12] Update circle.yml --- circle.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 9eb6cf2..bb3fb80 100644 --- a/circle.yml +++ b/circle.yml @@ -4,17 +4,18 @@ machine: version: 2.7.5 dependencies: - override: + post: # Moving to nilearn directory before performing the installation. - sudo apt-get update - sudo apt-get install -y python-numpy - sudo apt-get install -y python-scipy - sudo apt-get install -y libjpeg-dev zlib1g libtiff5-dev libfreetype6-dev libwebp-dev libopenjpeg-dev - - sudo pip install Pillow + - pip install Pillow - sudo apt-get install -y gdal-bin python-gdal - sudo apt-get install -y libopencv-dev python-opencv - sudo apt-get install -y libspatialindex-dev - - sudo pip install rtree numpy scipy + - pip install rtree numpy scipy + - pip install pygdal==1.10.1 # Set up the commands to run as a test (override), as well as the commands to # run before (pre) and after (post). From 4b93470a2eb94c1f7b2e50922c87085efc4676fa Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Mon, 15 May 2017 16:03:03 -0400 Subject: [PATCH 11/12] Update circle.yml --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index bb3fb80..542d4f7 100644 --- a/circle.yml +++ b/circle.yml @@ -14,6 +14,7 @@ dependencies: - sudo apt-get install -y gdal-bin python-gdal - sudo apt-get install -y libopencv-dev python-opencv - sudo apt-get install -y libspatialindex-dev + - sudo apt-get install libgdal-dev - pip install rtree numpy scipy - pip install pygdal==1.10.1 From 8f9c91cac04ee830069047f1d559e06120407288 Mon Sep 17 00:00:00 2001 From: dlindenbaum Date: Mon, 15 May 2017 16:34:49 -0400 Subject: [PATCH 12/12] Update circle.yml --- circle.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 542d4f7..bfad9b1 100644 --- a/circle.yml +++ b/circle.yml @@ -4,14 +4,16 @@ machine: version: 2.7.5 dependencies: + pre: + - sudo apt-get install -y libjpeg-dev zlib1g libtiff5-dev libfreetype6-dev libwebp-dev libopenjpeg-dev + - sudo apt-get install -y libopencv-dev python-opencv + - sudo apt-get install -y gdal-bin python-gdal post: # Moving to nilearn directory before performing the installation. - sudo apt-get update - sudo apt-get install -y python-numpy - sudo apt-get install -y python-scipy - - sudo apt-get install -y libjpeg-dev zlib1g libtiff5-dev libfreetype6-dev libwebp-dev libopenjpeg-dev - pip install Pillow - - sudo apt-get install -y gdal-bin python-gdal - sudo apt-get install -y libopencv-dev python-opencv - sudo apt-get install -y libspatialindex-dev - sudo apt-get install libgdal-dev