Skip to content
Permalink
Browse files
Fix osgeo import
  • Loading branch information
m-kuhn committed Apr 27, 2017
1 parent c3b2d00 commit 7147833cae5cd23a0488287f982d320af5a24782
Showing with 5 additions and 12 deletions.
  1. +3 −0 .ci/travis/macos/before_install.sh
  2. +2 −12 .ci/travis/macos/blacklist.txt
@@ -58,3 +58,6 @@ brew install \
# Fix qscintilla typo
wget https://gist.githubusercontent.com/m-kuhn/f70e4b160dd7b18eb8d637ed2a75df6d/raw/6eb8a0c8601ec52ad9ad41c01d0fad68fe967aa1/qsci.patch
patch -p1 /usr/local/share/sip/QSci/qscilexer.sip qsci.patch

mkdir -p ${HOME}/Library/Python/3.6/lib/python/site-packages
echo 'import site; site.addsitedir("/usr/local/opt/gdal2-python/lib/python3.6/site-packages")' >> ${HOME}/Library/Python/3.6/lib/python/site-packages/gdal2.pth
@@ -1,14 +1,9 @@
qgis_spelling
qgis_openstreetmaptest
qgis_wcsprovidertest
PyQgsServer
ProcessingGdalAlgorithmsTest
ProcessingScriptAlgorithmsTest
ProcessingToolsTest
ProcessingModelerTest
ProcessingParametersTest
ProcessingGrass7AlgorithmsImageryTest
ProcessingGrass7AlgorithmsRasterTest
PyQgsOfflineEditingWFS
ProcessingGdalAlgorithmsTest
ProcessingGrass7AlgorithmsImageryTest
ProcessingGrass7AlgorithmsRasterTest
qgis_composerhtmltest
@@ -36,8 +31,6 @@ PyQgsComposerLegend
PyQgsComposerMapGrid
PyQgsDistanceArea
PyQgsJSONUtils
PyQgsOGRProviderGpkg
PyQgsOGRProviderSqlite
PyQgsPalLabelingBase
PyQgsPalLabelingPlacement
PyQgsPalLabelingComposer
@@ -46,10 +39,7 @@ qgis_composermapgridtest
qgis_composerpicturetest
qgis_taskmanagertest
PyQgsPalLabelingCanvas
PyQgsShapefileProvider
PyQgsTabfileProvider
PyQgsTextRenderer
PyQgsOGRProvider
PyQgsSpatialiteProvider
PyQgsSymbolLayer
PyQgsVectorFileWriter

5 comments on commit 7147833

@3nids

This comment has been minimized.

Copy link
Member

@3nids 3nids replied Apr 27, 2017

There is no more log visible on Travis for the code_layout test since this commit.

@m-kuhn

This comment has been minimized.

Copy link
Member Author

@m-kuhn m-kuhn replied Apr 27, 2017

Might be related to this

Scheduled - We need to get our regular partition maintenance query back on track, which will require an interruption in log parts processing. During the maintenance, we expect jobs to continue running, including any deployment steps and GitHub status updates, but realtime log streaming and lookup of log output from public jobs that were running from the beginning of maintenance will be unavailable.

https://www.traviscistatus.com/

Let's wait and see

@3nids

This comment has been minimized.

Copy link
Member

@3nids 3nids replied Apr 27, 2017

sorry for the accusation!

@3nids

This comment has been minimized.

Copy link
Member

@3nids 3nids replied Apr 27, 2017

it seems travis is running only one PR at a time now.
https://travis-ci.org/qgis/QGIS/pull_requests
Is this from Travis again?

@m-kuhn

This comment has been minimized.

Copy link
Member Author

@m-kuhn m-kuhn replied Apr 27, 2017

I think their mac infrastructure is under heavy load https://www.traviscistatus.com/ so they are very careful with running too much in parallel

Please sign in to comment.