From 3c01e2cc05d7c0ade9cab3b27d32310439401c50 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Thu, 26 Feb 2015 14:23:25 +0000 Subject: [PATCH 1/9] commas in package list --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3e17e0a..f010f79 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ init: - mkdir %systemdrive%\OSGeo4w - cd %systemdrive%\OSGeo4w - ps: (new-object net.webclient).DownloadFile('http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe', 'osgeo4w-setup-x86_64.exe') - - osgeo4w-setup-x86_64.exe --quiet-mode --upgrade-also --delete-orphans --no-desktop --advanced --root %systemdrive%\OSGeo4w --packages msvcrt setup shell avce00 zlib iconv libxml2 cairo openssl curl expat fcgi ffmpeg fftw freexl fribidi libpng libjpeg libjpeg12 libtiff libgeotiff proj-hpgn proj-datumgrid proj geos libmysql sqlite3 hdf5 netcdf libpq xerces-c-vc10 hdf4 ogdi openjpeg spatialite gdal python-core python-numpy gdal-python gdal-autotest gdal-filegdb pdcurses msys python-win32 wxpython python-pil pyopengl gs grass gsl-libs libspatialindex mapserver mapscript-python msinttypes opencv psycopg2 qt4-libs pyqt4 pyspatialite six python-dateutil python-devel python-help sip qscintilla python-qscintilla python-shapely python-simplejson python-tcltk python-test python-tools python-xlrd python-xlwt qwt5-libs-qt4 qgis-common qgis qgis-grass-plugin qgis-server setuptools --site http://download.osgeo.org/osgeo4w + - osgeo4w-setup-x86_64.exe --quiet-mode --upgrade-also --delete-orphans --no-desktop --advanced --root %systemdrive%\OSGeo4w --packages msvcrt,setup,shell,avce00,zlib,iconv,libxml2,cairo,openssl,curl,expat,fcgi,ffmpeg,fftw,freexl,fribidi,libpng,libjpeg,libjpeg12,libtiff,libgeotiff,proj-hpgn,proj-datumgrid,proj,geos,libmysql,sqlite3,hdf5,netcdf,libpq,xerces-c-vc10,hdf4,ogdi,openjpeg,spatialite,gdal,python-core,python-numpy,gdal-python,gdal-autotest,gdal-filegdb,pdcurses,msys,python-win32,wxpython,python-pil,pyopengl,gs,grass,gsl-libs,libspatialindex,mapserver,mapscript-python,msinttypes,opencv,psycopg2,qt4-libs,pyqt4,pyspatialite,six,python-dateutil,python-devel,python-help,sip,qscintilla,python-qscintilla,python-shapely,python-simplejson,python-tcltk,python-test,python-tools,python-xlrd,python-xlwt,qwt5-libs-qt4,qgis-common,qgis,qgis-grass-plugin,qgis-server,setuptools --site http://download.osgeo.org/osgeo4w - cd %APPVEYOR_BUILD_FOLDER% build: off @@ -19,4 +19,5 @@ test_script: - '%systemdrive%\OSGeo4w\OSGeo4W.bat python osm2mapaction.py' branches: only: - - feature/excel-parse-tests \ No newline at end of file + - feature/excel-parse-tests + - test/appvey-config \ No newline at end of file From 31ecc22b8cee443224758049fede046a07a29cfa Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Thu, 26 Feb 2015 23:22:30 +0000 Subject: [PATCH 2/9] removed QGIS packages from build --- appveyor.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f010f79..a3949e7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ init: - mkdir %systemdrive%\OSGeo4w - cd %systemdrive%\OSGeo4w - ps: (new-object net.webclient).DownloadFile('http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe', 'osgeo4w-setup-x86_64.exe') - - osgeo4w-setup-x86_64.exe --quiet-mode --upgrade-also --delete-orphans --no-desktop --advanced --root %systemdrive%\OSGeo4w --packages msvcrt,setup,shell,avce00,zlib,iconv,libxml2,cairo,openssl,curl,expat,fcgi,ffmpeg,fftw,freexl,fribidi,libpng,libjpeg,libjpeg12,libtiff,libgeotiff,proj-hpgn,proj-datumgrid,proj,geos,libmysql,sqlite3,hdf5,netcdf,libpq,xerces-c-vc10,hdf4,ogdi,openjpeg,spatialite,gdal,python-core,python-numpy,gdal-python,gdal-autotest,gdal-filegdb,pdcurses,msys,python-win32,wxpython,python-pil,pyopengl,gs,grass,gsl-libs,libspatialindex,mapserver,mapscript-python,msinttypes,opencv,psycopg2,qt4-libs,pyqt4,pyspatialite,six,python-dateutil,python-devel,python-help,sip,qscintilla,python-qscintilla,python-shapely,python-simplejson,python-tcltk,python-test,python-tools,python-xlrd,python-xlwt,qwt5-libs-qt4,qgis-common,qgis,qgis-grass-plugin,qgis-server,setuptools --site http://download.osgeo.org/osgeo4w + - osgeo4w-setup-x86_64.exe --quiet-mode --upgrade-also --delete-orphans --no-desktop --advanced --root %systemdrive%\OSGeo4w --packages msvcrt,setup,shell,avce00,zlib,iconv,libxml2,cairo,openssl,curl,expat,fcgi,ffmpeg,fftw,freexl,fribidi,libpng,libjpeg,libjpeg12,libtiff,libgeotiff,proj-hpgn,proj-datumgrid,proj,geos,libmysql,sqlite3,hdf5,netcdf,libpq,xerces-c-vc10,hdf4,ogdi,openjpeg,spatialite,gdal,python-core,python-numpy,gdal-python,gdal-autotest,gdal-filegdb,pdcurses,msys,python-win32,wxpython,python-pil,pyopengl,gs,gsl-libs,libspatialindex,mapserver,mapscript-python,msinttypes,opencv,psycopg2,qt4-libs,pyqt4,pyspatialite,six,python-dateutil,python-devel,python-help,sip,qscintilla,python-qscintilla,python-shapely,python-simplejson,python-tcltk,python-test,python-tools,python-xlrd,python-xlwt,qwt5-libs-qt4,setuptools --site http://download.osgeo.org/osgeo4w - cd %APPVEYOR_BUILD_FOLDER% build: off @@ -15,9 +15,8 @@ test_script: - cd osm2ma - echo %path% - '%systemdrive%\OSGeo4w\OSGeo4W.bat echo %path%' + - '%systemdrive%\OSGeo4w\OSGeo4W.bat python -m unittest discover -s osm2ma' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python tests.py' - - '%systemdrive%\OSGeo4w\OSGeo4W.bat python osm2mapaction.py' branches: only: - - feature/excel-parse-tests - - test/appvey-config \ No newline at end of file + - test/appvey-config From e307bd22cbcd342b94e76ca83dc7e1d2eeac04e4 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Thu, 26 Feb 2015 23:35:27 +0000 Subject: [PATCH 3/9] changed test order --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a3949e7..82a5607 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,8 @@ test_script: - cd osm2ma - echo %path% - '%systemdrive%\OSGeo4w\OSGeo4W.bat echo %path%' - - '%systemdrive%\OSGeo4w\OSGeo4W.bat python -m unittest discover -s osm2ma' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python tests.py' + - '%systemdrive%\OSGeo4w\OSGeo4W.bat python -m unittest discover -s osm2ma' branches: only: - test/appvey-config From 53a87472c50eb1f27aaff0605657f7a4b17d8523 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Fri, 27 Feb 2015 00:09:19 +0000 Subject: [PATCH 4/9] added "o-help" cmd --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 82a5607..9ea3875 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,6 +15,7 @@ test_script: - cd osm2ma - echo %path% - '%systemdrive%\OSGeo4w\OSGeo4W.bat echo %path%' + - '%systemdrive%\OSGeo4w\OSGeo4W.bat o-help' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python tests.py' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python -m unittest discover -s osm2ma' branches: From 6460af32893fbd402b63541419ee3bebe49836d3 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Fri, 27 Feb 2015 00:29:14 +0000 Subject: [PATCH 5/9] added gdalinfo.exe cmd --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 9ea3875..f572292 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,6 +16,7 @@ test_script: - echo %path% - '%systemdrive%\OSGeo4w\OSGeo4W.bat echo %path%' - '%systemdrive%\OSGeo4w\OSGeo4W.bat o-help' + - '%systemdrive%\OSGeo4w\bin\gdalinfo.exe --version' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python tests.py' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python -m unittest discover -s osm2ma' branches: From a9a0c31f26164cacfc2fcf8016387c5b6d734341 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Fri, 27 Feb 2015 00:41:23 +0000 Subject: [PATCH 6/9] changed syntax of gdalinfo.exe call --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f572292..7e22061 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,7 @@ test_script: - echo %path% - '%systemdrive%\OSGeo4w\OSGeo4W.bat echo %path%' - '%systemdrive%\OSGeo4w\OSGeo4W.bat o-help' - - '%systemdrive%\OSGeo4w\bin\gdalinfo.exe --version' + - '%systemdrive%\OSGeo4w\OSGeo4W.bat gdalinfo --version' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python tests.py' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python -m unittest discover -s osm2ma' branches: From 0e7242b4ecd3942ed5e9ca091c7b651b1d6ec905 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Sat, 28 Feb 2015 14:57:49 +0000 Subject: [PATCH 7/9] Try unstable OS with cygwin pre-installed --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 7e22061..4570bd8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,8 @@ version: 1.9.alpha.{build} +environment: + os: unstable + init: - echo %path% - path=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Mercurial;C:\Program Files\7-Zip;C:\Tools\xUnit;C:\Tools\NUnit\bin;C:\Tools\NuGet;C:\Python27;C:\Tools\WebDriver;C:\Tools\MSpec;C:\Program Files\Java\jdk1.7.0\bin;C:\ProgramData\chocolatey\bin;C:\Tools\GitVersion;C:\Program Files (x86)\Git\cmd;C:\Program Files (x86)\Git\bin;C:\Program Files (x86)\CollabNet\Subversion Client;C:\Users\appveyor\AppData\Roaming\npm;C:\Ruby193\bin;C:\Program Files (x86)\CMake\bin;C:\go\bin;C:\Chocolatey\bin;C:\Program Files\AppVeyor\BuildAgent From cb9af2990a7e7e7c3ce03da80ec086bcf19444f5 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Tue, 7 Apr 2015 14:36:17 +0100 Subject: [PATCH 8/9] Add reboot after OSGeo2W install --- .gitignore | 2 ++ appveyor.yml | 3 +++ disabled-appveyor.yml | 25 +++++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 disabled-appveyor.yml diff --git a/.gitignore b/.gitignore index afa464a..05d7073 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ osm2ma/.idea *.sw[po] *.pyc +*.coverage +*.py,cover diff --git a/appveyor.yml b/appveyor.yml index 4570bd8..06e7ad0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,8 @@ init: - cd %systemdrive%\OSGeo4w - ps: (new-object net.webclient).DownloadFile('http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe', 'osgeo4w-setup-x86_64.exe') - osgeo4w-setup-x86_64.exe --quiet-mode --upgrade-also --delete-orphans --no-desktop --advanced --root %systemdrive%\OSGeo4w --packages msvcrt,setup,shell,avce00,zlib,iconv,libxml2,cairo,openssl,curl,expat,fcgi,ffmpeg,fftw,freexl,fribidi,libpng,libjpeg,libjpeg12,libtiff,libgeotiff,proj-hpgn,proj-datumgrid,proj,geos,libmysql,sqlite3,hdf5,netcdf,libpq,xerces-c-vc10,hdf4,ogdi,openjpeg,spatialite,gdal,python-core,python-numpy,gdal-python,gdal-autotest,gdal-filegdb,pdcurses,msys,python-win32,wxpython,python-pil,pyopengl,gs,gsl-libs,libspatialindex,mapserver,mapscript-python,msinttypes,opencv,psycopg2,qt4-libs,pyqt4,pyspatialite,six,python-dateutil,python-devel,python-help,sip,qscintilla,python-qscintilla,python-shapely,python-simplejson,python-tcltk,python-test,python-tools,python-xlrd,python-xlwt,qwt5-libs-qt4,setuptools --site http://download.osgeo.org/osgeo4w + - ps: Restart-Computer -Force # here the server goes restarting + - ps: Start-Sleep -s 10 - cd %APPVEYOR_BUILD_FOLDER% build: off @@ -21,6 +23,7 @@ test_script: - '%systemdrive%\OSGeo4w\OSGeo4W.bat o-help' - '%systemdrive%\OSGeo4w\OSGeo4W.bat gdalinfo --version' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python tests.py' + - '%systemdrive%\OSGeo4w\OSGeo4W.bat python gdal_on_appveyour_test.py' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python -m unittest discover -s osm2ma' branches: only: diff --git a/disabled-appveyor.yml b/disabled-appveyor.yml new file mode 100644 index 0000000..5535af3 --- /dev/null +++ b/disabled-appveyor.yml @@ -0,0 +1,25 @@ +version: 1.9.alpha.{build} + +init: + - echo %path% + - path=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Mercurial;C:\Program Files\7-Zip;C:\Tools\xUnit;C:\Tools\NUnit\bin;C:\Tools\NuGet;C:\Python27;C:\Tools\WebDriver;C:\Tools\MSpec;C:\Program Files\Java\jdk1.7.0\bin;C:\ProgramData\chocolatey\bin;C:\Tools\GitVersion;C:\Program Files (x86)\Git\cmd;C:\Program Files (x86)\Git\bin;C:\Program Files (x86)\CollabNet\Subversion Client;C:\Users\appveyor\AppData\Roaming\npm;C:\Ruby193\bin;C:\Program Files (x86)\CMake\bin;C:\go\bin;C:\Chocolatey\bin;C:\Program Files\AppVeyor\BuildAgent + - mkdir %systemdrive%\OSGeo4w + - cd %systemdrive%\OSGeo4w + - ps: (new-object net.webclient).DownloadFile('http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe', 'osgeo4w-setup-x86_64.exe') + - osgeo4w-setup-x86_64.exe --quiet-mode --upgrade-also --delete-orphans --no-desktop --advanced --root %systemdrive%\OSGeo4w --packages msvcrt setup shell avce00 zlib iconv libxml2 cairo openssl curl expat fcgi ffmpeg fftw freexl fribidi libpng libjpeg libjpeg12 libtiff libgeotiff proj-hpgn proj-datumgrid proj geos libmysql sqlite3 hdf5 netcdf libpq xerces-c-vc10 hdf4 ogdi openjpeg spatialite gdal python-core python-numpy gdal-python gdal-autotest gdal-filegdb pdcurses msys python-win32 wxpython python-pil pyopengl gs grass gsl-libs libspatialindex mapserver mapscript-python msinttypes opencv psycopg2 qt4-libs pyqt4 pyspatialite six python-dateutil python-devel python-help sip qscintilla python-qscintilla python-shapely python-simplejson python-tcltk python-test python-tools python-xlrd python-xlwt qwt5-libs-qt4 qgis-common qgis qgis-grass-plugin qgis-server setuptools --site http://download.osgeo.org/osgeo4w + - ps: Restart-Computer -Force # here the server goes restarting + - ps: Start-Sleep -s 10 + - cd %APPVEYOR_BUILD_FOLDER% + +build: off + +test_script: + - cd osm2ma + - echo %path% + - '%systemdrive%\OSGeo4w\OSGeo4W.bat echo %path%' + - '%systemdrive%\OSGeo4w\OSGeo4W.bat python gdal_on_appveyour_test.py' + - '%systemdrive%\OSGeo4w\OSGeo4W.bat python tests.py' + - '%systemdrive%\OSGeo4w\OSGeo4W.bat python osm2mapaction.py' +branches: + only: + - test/appvey-config \ No newline at end of file From a5cec8f18c5ab499e6d91c69cab809b76904cefe Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Tue, 7 Apr 2015 14:55:21 +0100 Subject: [PATCH 9/9] In GDALinfo.exe present --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 06e7ad0..c391f74 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,6 +21,7 @@ test_script: - echo %path% - '%systemdrive%\OSGeo4w\OSGeo4W.bat echo %path%' - '%systemdrive%\OSGeo4w\OSGeo4W.bat o-help' + - '%systemdrive%\OSGeo4w\OSGeo4W.bat where gdalinfo' - '%systemdrive%\OSGeo4w\OSGeo4W.bat gdalinfo --version' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python tests.py' - '%systemdrive%\OSGeo4w\OSGeo4W.bat python gdal_on_appveyour_test.py'