[GRASS-SVN] r73294 - in grass/trunk: . gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2018-09-08 02:20:12 -0700 (Sat, 08 Sep 2018)
New Revision: 73294

Modified:
   grass/trunk/Vagrantfile
   grass/trunk/gui/wxpython/gui_core/ghelp.py
Log:
vagrafile: switch to bionic

Modified: grass/trunk/Vagrantfile
===================================================================
--- grass/trunk/Vagrantfile	2018-09-08 06:47:57 UTC (rev 73293)
+++ grass/trunk/Vagrantfile	2018-09-08 09:20:12 UTC (rev 73294)
@@ -13,10 +13,10 @@
   vm_ram = ENV['VAGRANT_VM_RAM'] || 1024
   vm_cpu = ENV['VAGRANT_VM_CPU'] || 1
   
-  config.vm.box = "xenial64"
+  config.vm.box = "bionic64"
   
   config.vm.hostname = "grass-gis-vagrant"
-  config.vm.box_url = "https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-vagrant.box"
+  config.vm.box_url = "https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64-vagrant.box"
   config.vm.define "grass-gis-vagrant" do |host|
     
     config.vm.network :forwarded_port, guest: 80, host: 8080

Modified: grass/trunk/gui/wxpython/gui_core/ghelp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/ghelp.py	2018-09-08 06:47:57 UTC (rev 73293)
+++ grass/trunk/gui/wxpython/gui_core/ghelp.py	2018-09-08 09:20:12 UTC (rev 73294)
@@ -31,7 +31,7 @@
     _unichr = chr
 
 import wx
-from wx.html import HtmlWindow
+from wx.html2 import WebView as HtmlWindow
 try:
     from wx.lib.agw.hyperlink import HyperLinkCtrl
 except ImportError: