Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
osm2ma/.idea
*.sw[po]
*.pyc
*.coverage
*.py,cover
15 changes: 12 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
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
- 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
- ps: Restart-Computer -Force # here the server goes restarting
- ps: Start-Sleep -s 10
- cd %APPVEYOR_BUILD_FOLDER%

build: off
Expand All @@ -15,8 +20,12 @@ test_script:
- cd osm2ma
- 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 osm2mapaction.py'
- '%systemdrive%\OSGeo4w\OSGeo4W.bat python gdal_on_appveyour_test.py'
- '%systemdrive%\OSGeo4w\OSGeo4W.bat python -m unittest discover -s osm2ma'
branches:
only:
- feature/excel-parse-tests
- test/appvey-config
25 changes: 25 additions & 0 deletions disabled-appveyor.yml
Original file line number Diff line number Diff line change
@@ -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