Skip to content

Commit

Permalink
Fix osgeo import
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Apr 27, 2017
1 parent c3b2d00 commit 7147833
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
3 changes: 3 additions & 0 deletions .ci/travis/macos/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 2 additions & 12 deletions .ci/travis/macos/blacklist.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
qgis_spelling
qgis_openstreetmaptest
qgis_wcsprovidertest
PyQgsServer
ProcessingGdalAlgorithmsTest
ProcessingScriptAlgorithmsTest
ProcessingToolsTest
ProcessingModelerTest
ProcessingParametersTest
ProcessingGrass7AlgorithmsImageryTest
ProcessingGrass7AlgorithmsRasterTest
PyQgsOfflineEditingWFS
ProcessingGdalAlgorithmsTest
ProcessingGrass7AlgorithmsImageryTest
ProcessingGrass7AlgorithmsRasterTest
qgis_composerhtmltest
Expand Down Expand Up @@ -36,8 +31,6 @@ PyQgsComposerLegend
PyQgsComposerMapGrid
PyQgsDistanceArea
PyQgsJSONUtils
PyQgsOGRProviderGpkg
PyQgsOGRProviderSqlite
PyQgsPalLabelingBase
PyQgsPalLabelingPlacement
PyQgsPalLabelingComposer
Expand All @@ -46,10 +39,7 @@ qgis_composermapgridtest
qgis_composerpicturetest
qgis_taskmanagertest
PyQgsPalLabelingCanvas
PyQgsShapefileProvider
PyQgsTabfileProvider
PyQgsTextRenderer
PyQgsOGRProvider
PyQgsSpatialiteProvider
PyQgsSymbolLayer
PyQgsVectorFileWriter
Expand Down

5 comments on commit 7147833

@3nids
Copy link
Member

@3nids 3nids commented on 7147833 Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@m-kuhn
Copy link
Member Author

@m-kuhn m-kuhn commented on 7147833 Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member

@3nids 3nids commented on 7147833 Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the accusation!

@3nids
Copy link
Member

@3nids 3nids commented on 7147833 Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member Author

@m-kuhn m-kuhn commented on 7147833 Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.