Merge pull request #122 from cvvergara/travistest

Travistest
pgRouting · Mar 6, 2019 · 81cc2f8 · 81cc2f8
2 parents 613a5af + 95db3e6
commit 81cc2f8
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 295 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,35 @@
+# ------------------------------------------------------------------------------
+# Travis CI scripts
+# Copyright(c) pgRouting Contributors
+#
+# Main configuration
+# ------------------------------------------------------------------------------
+
+dist: xenial
+
+language: python
+python:
+  - "3.5"
+
+addons:
+  apt:
+    packages:
+        -  pyqt5-dev-tools
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+
+before_cache:
+  - rm -f $HOME/.cache/pip/log/debug.log
+
+install:
+  - pip install -r requirements.txt
+
+before_script:
+  - mkdir build
+
+script:
+  - pb_tool deploy -y -p build
+  - mkdocs build
+
diff --git a/connectors/__init__.py b/connectors/__init__.py
diff --git a/docs/functions/pgr_KSP.md b/docs/functions/pgr_KSP.md
@@ -42,7 +42,7 @@
 |![Heap paths](../img/fields/arguments/KSP_heapPaths.png)| Tick.. ![Heap paths](../img/fields/arguments/KSP_heapPathsON.png)
 |![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
 
-## Execute tab 
+## Execute tab
 ![Execute tab](../img/tabs/execute/execute.png)
 
 |Button|Action|
@@ -52,8 +52,8 @@
 |![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
 |![Export Merged](../img/buttons/execute/exportmergedON.png)| Creates a one row per path multiline geometry layer. As many rows as needed|
 
-Depending on the pressed button the layer name will be 
+Depending on the pressed button the layer name will be
 ```
 (<U|D>) pgr_KSP: <source_id>  to <target_id>  BBOX(<bbox>)
 (M <U|D>) pgr_KSP: <source_id>  to <target_id>  BBOX(<bbox>)
-```
+```
diff --git a/docs/functions/pgr_aStar.md b/docs/functions/pgr_aStar.md
@@ -45,7 +45,7 @@
 |![Epsilon](../img/fields/arguments/astar_epsilon.png)| For less restricted results. `epsilon >= 1`.  Default ``1``.|
 |![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
 
-## Execute tab 
+## Execute tab
 ![Execute tab](../img/tabs/execute/execute.png)
 
 |Button|Action|
@@ -56,8 +56,8 @@
 |![Export Merged](../img/buttons/execute/exportmergedON.png)| Creates a one row per path multiline geometry layer. As many rows as needed|
 
 
-Depending on the pressed button the layer name will be 
+Depending on the pressed button the layer name will be
 ```
 (<U|D>) pgr_astar: <source_id>  to <target_id>  BBOX(<bbox>)
 (M <U|D>) pgr_astar: <source_id>  to <target_id>  BBOX(<bbox>)
-```
+```
diff --git a/docs/functions/pgr_astarCost.md b/docs/functions/pgr_astarCost.md
@@ -43,7 +43,7 @@
 |![Epsilon](../img/fields/arguments/astar_epsilon.png)| For less restricted results. `epsilon >= 1`.  Default ``1``.|
 |![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
 
-## Execute tab 
+## Execute tab
 ![Execute tab](../img/tabs/execute/execute.png)
 
 |Button|Action|
@@ -53,7 +53,7 @@
 |![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
 |![Export Merged](../img/buttons/execute/exportmergedOFF.png)| Disabled|
 
-Depending on the pressed button the layer name will be 
+Depending on the pressed button the layer name will be
 ```
 (<U|D>) pgr_astarCost: <source_id>  to <target_id>  BBOX(<bbox>)
-```
+```
diff --git a/docs/functions/pgr_bdAstar.md b/docs/functions/pgr_bdAstar.md
@@ -45,19 +45,19 @@
 |![Epsilon](../img/fields/arguments/astar_epsilon.png)| For less restricted results. `epsilon >= 1`.  Default ``1``.|
 |![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
 
-## Execute tab 
+## Execute tab
 ![Execute tab](../img/tabs/execute/execute.png)
 
 |Button|Action|
 | ----------- | --------- |
 |![Preview](../img/buttons/execute/preview.png)| Draws in the canvas the resulting path |
 |![Clear Preview](../img/buttons/execute/clearpreview.png)| Removes from the canvas objects generated with Preview|
 |![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
-|![Export Merged](../img/buttons/execute/exportmergedON.png)| Creates a one row per path multiline geometry layer. As many rows as needed|
+|![Export Merged](../img/buttons/execute/exportmergedON.png)| Creates a one row per path multi line geometry layer. As many rows as needed|
 
 
-Depending on the pressed button the layer name will be 
+Depending on the pressed button the layer name will be
 ```
 (<U|D>) pgr_bdAstar: <source_id>  to <target_id>  BBOX(<bbox>)
 (M <U|D>) pgr_bdAstar: <source_id>  to <target_id>  BBOX(<bbox>)
-```
+```
diff --git a/docs/functions/pgr_bdAstarCost.md b/docs/functions/pgr_bdAstarCost.md
@@ -40,7 +40,7 @@
 |![toVids](../img/fields/arguments/astar-dijkstra_toVids.png)|Choose with ![plus](../img/tabs/arguments/plus_button.png) or write the comma separated identifiers of the destination vertices|
 |![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
 
-## Execute tab 
+## Execute tab
 ![Execute tab](../img/tabs/execute/ExecuteCost.png)
 
 |Button|Action|
@@ -50,7 +50,7 @@
 |![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
 |![Export Merged](../img/buttons/execute/exportmergedOFF.png)| Disabled|
 
-Depending on the pressed button the layer name will be 
+Depending on the pressed button the layer name will be
 ```
 (<U|D>) pgr_bdAstarCost: <source_id>  to <target_id>  BBOX(<bbox>)
-```
+```
diff --git a/docs/functions/pgr_bdDijkstra.md b/docs/functions/pgr_bdDijkstra.md
@@ -40,7 +40,7 @@
 |![toVids](../img/fields/arguments/astar-dijkstra_toVids.png)|Choose with ![plus](../img/tabs/arguments/plus_button.png) or write the comma separated identifiers of the destination vertices|
 |![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
 
-## Execute tab 
+## Execute tab
 ![Execute tab](../img/tabs/execute/execute.png)
 
 |Button|Action|
@@ -50,8 +50,8 @@
 |![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
 |![Export Merged](../img/buttons/execute/exportmergedON.png)| Creates a one row per path multiline geometry layer. As many rows as needed|
 
-Depending on the pressed button the layer name will be 
+Depending on the pressed button the layer name will be
 ```
 (<U|D>) pgr_bdDijkstra: <source_id>  to <target_id>  BBOX(<bbox>)
 (M <U|D>) pgr_bdDijkstra: <source_id>  to <target_id>  BBOX(<bbox>)
-```
+```
diff --git a/docs/functions/pgr_bdDijkstraCost.md b/docs/functions/pgr_bdDijkstraCost.md
@@ -40,7 +40,7 @@
 |![toVids](../img/fields/arguments/astar-dijkstra_toVids.png)|Choose with ![plus](../img/tabs/arguments/plus_button.png) or write the comma separated identifiers of the destination vertices|
 |![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
 
-## Execute tab 
+## Execute tab
 ![Execute tab](../img/tabs/execute/ExecuteCost.png)
 
 |Button|Action|
@@ -50,7 +50,7 @@
 |![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
 |![Export Merged](../img/buttons/execute/exportmergedOFF.png)| Disabled|
 
-Depending on the pressed button the layer name will be 
+Depending on the pressed button the layer name will be
 ```
 (<U|D>) pgr_bdDijkstraCost: <source_id>  to <target_id>  BBOX(<bbox>)
-```
+```
diff --git a/docs/functions/pgr_dijkstra.md b/docs/functions/pgr_dijkstra.md
@@ -40,7 +40,7 @@
 |![toVids](../img/fields/arguments/astar-dijkstra_toVids.png)|Choose with ![plus](../img/tabs/arguments/plus_button.png) or write the comma separated identifiers of the destination vertices|
 |![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
 
-## Execute tab 
+## Execute tab
 ![Execute tab](../img/tabs/execute/execute.png)
 
 |Button|Action|
@@ -50,8 +50,8 @@
 |![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
 |![Export Merged](../img/buttons/execute/exportmergedON.png)| Creates a one row per path multiline geometry layer. As many rows as needed|
 
-Depending on the pressed button the layer name will be 
+Depending on the pressed button the layer name will be
 ```
 (<U|D>) pgr_dijkstra: <source_id>  to <target_id>  BBOX(<bbox>)
 (M <U|D>) pgr_dijkstra: <source_id>  to <target_id>  BBOX(<bbox>)
-```
+```
diff --git a/docs/functions/pgr_dijkstraCost.md b/docs/functions/pgr_dijkstraCost.md
@@ -40,7 +40,7 @@
 |![toVids](../img/fields/arguments/astar-dijkstra_toVids.png)|Choose with ![plus](../img/tabs/arguments/plus_button.png) or write the comma separated identifiers of the destination vertices|
 |![Directed](../img/fields/arguments/directedOFF.png)| Tick if the graph is directed ![Directed](../img/fields/arguments/directedON.png)|
 
-## Execute tab 
+## Execute tab
 ![Execute tab](../img/tabs/execute/ExecuteCost.png)
 
 |Button|Action|
@@ -50,7 +50,7 @@
 |![Export](../img/buttons/execute/export.png)| Creates a one row per edge line geometry layer|
 |![Export Merged](../img/buttons/execute/exportmergedOFF.png)| Disabled|
 
-Depending on the pressed button the layer name will be 
+Depending on the pressed button the layer name will be
 ```
 (<U|D>) pgr_dijkstraCost: <source_id>  to <target_id>  BBOX(<bbox>)
-```
+```
diff --git a/functions/__init__.py b/functions/__init__.py
diff --git a/metadata.txt b/metadata.txt
@@ -2,31 +2,26 @@
 name=pgRoutingLayer
 description=Dockable widget that adds pgRouting layers
 about=Dockable widget that adds pgRouting layers
+    - pgr_astar pgr_astarCost
+    - pgr_bdAstar pgr_astarCost
+    - pgr_dijstra pgr_dijstraCost
+    - pgr_bdDijstra pgr_bdDijstraCost
+    - pgr_KSP
 version=3.0.0
 qgisMinimumVersion=3.0
 qgisMaximumVersion=3.99
-author=Anita Graser, Ko Nagase, Vicky Vergara
+author=Anita Graser, Ko Nagase, Vicky Vergara, Cayetano Benavent, Aasheesh Tiwari
 [email protected]
 changelog=3.0.0
-    - Support for QGIS 3 (Python 3 and PyQt5). 
+    - Support for QGIS 3 (Python 3 and PyQt5).
     - Removed deprecated functions.
+    - Support only for some functions that are known to be on pgRouting 3.0
     2.2.2
-    - Bug fix: activating alphashape.py to use BBOX by mixedbredie
-    2.2.1
-    - Bug fix activating plugin
-    2.2.0
-    - Support for pgRouting V2.0 up to v2.5
-    - BBOX is optional
-    2.1.0
-    - change support sites
-    - port to pgRouting 2.1 API by pgRouting team
-    - drop QGIS 1.8 support
-    2.0.0
-    - port to 2.0 API by Ko Nagase
+    - Last experimental release works only for QGIS 2.x
 tags=pgRouting,PostGIS,routing,network analysis
 icon=icon.png
-experimental=True
-homepage=https://github.com/pgRouting/pgRoutingLayer/wiki
-tracker=https://github.com/pgRouting/pgRoutingLayer
+experimental=False
+homepage=https://qgis.pgrouting.org/
+tracker=https://github.com/pgRouting/pgRoutingLayer/issues
 repository=https://github.com/pgRouting/pgRoutingLayer
 category=Database
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -8,7 +8,7 @@ nav:
   - pgr_aStar: functions/pgr_aStar.md
   - pgr_astarCost: functions/pgr_astarCost.md
   - pgr_bdAstar: functions/pgr_bdAstar.md
-  - pgr_bdAstarCost: functions/pgr_bdAstar.md
+  - pgr_bdAstarCost: functions/pgr_bdAstarCost.md
   - pgr_bdDijkstra: functions/pgr_bdDijkstra.md
   - pgr_bdDijkstraCost: functions/pgr_bdDijkstraCost.md
   - pgr_djikstra: functions/pgr_dijkstra.md

diff --git a/pb_tool.cfg b/pb_tool.cfg
@@ -6,8 +6,10 @@ name: pgRoutingLayer
 # Full path to where you want your plugin directory copied. If empty,
 # the QGIS default path will be used. Don't include the plugin name in
 # the path.
-# plugin_path: ~/.local/share/QGIS/QGIS3/profiles/pgrouting/python/plugins/
-plugin_path: /home/martha/.local/share/QGIS/QGIS3/profiles/pgRouting/python/plugins
+# if this does not work then use like
+# pb_tool deploy -p /home/vicky/.local/share/QGIS/QGIS3/profiles/default/python/plugins
+
+plugin_path: ~/.local/share/QGIS/QGIS3/profiles/default/python/plugins/
 
 [files]
 # Python  files that should be deployed with the plugin

diff --git a/pgRoutingLayer.py b/pgRoutingLayer.py
@@ -1161,7 +1161,7 @@ def loadSettings(self):
         if idx >= 0:
             self.dock.comboBoxFunction.setCurrentIndex(idx)
 
-        self.dock.lineEditSchema.setText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/edge_schema', 'edge_schema'))
+        self.dock.lineEditSchema.setText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/edge_schema', 'public'))
         self.dock.lineEditTable.setText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/edge_table', 'edge_table'))
         self.dock.lineEditGeometry.setText(Utils.getStringValue(settings, '/pgRoutingLayer/sql/geometry', 'the_geom'))
 

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,2 @@
+mkdocs
+pb_tool