Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Travistest #122

Merged
merged 16 commits into from
Mar 6, 2019
Merged

Travistest #122

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fda4121
[Build] resources.py is autogenerated with pb_tool
cvvergara Mar 5, 2019
4ac254b
The directories are not containing packages
cvvergara Mar 5, 2019
6628025
[Build] using a general path for plugin_path
cvvergara Mar 5, 2019
d9df63b
[Meta] updating metadata
cvvergara Mar 5, 2019
fcfd80c
[MEta] fixing metadata
cvvergara Mar 5, 2019
bc044d9
more on fixing metadata
cvvergara Mar 6, 2019
7f698e6
setting the default schema to be default
cvvergara Mar 6, 2019
3a647bd
[travis] adding requirements & travis file
cvvergara Mar 6, 2019
8a1a763
[travis] adding a phony line to trigger travis
cvvergara Mar 6, 2019
3d39c52
[travis] adding pyqt5
cvvergara Mar 6, 2019
ee9f836
[travis] adding pyqt5
cvvergara Mar 6, 2019
c531c31
[travis] testing deploy
cvvergara Mar 6, 2019
91a7221
[travis] testing deploy auto yes
cvvergara Mar 6, 2019
6171c55
[travis] removing phoney line to test cache
cvvergara Mar 6, 2019
c42eb8e
[lint] removing trailing spaces
cvvergara Mar 6, 2019
95db3e6
[travis] using xenial
cvvergara Mar 6, 2019
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
37 changes: 37 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# ------------------------------------------------------------------------------
# Travis CI scripts
# Copyright(c) pgRouting Contributors
#
# Main configuration
# ------------------------------------------------------------------------------

dist: trusty
Copy link
Member

Choose a reason for hiding this comment

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

We shouldn't use Trusty because is near of his EOL (April 2019). We should use Bionic Beaver.

sudo: required


language: python
python:
- "3.5-dev" # 3.5 development branch
Copy link
Member

Choose a reason for hiding this comment

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

It is better 3.6


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

Empty file removed connectors/__init__.py
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions docs/functions/pgr_KSP.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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>)
```
```
6 changes: 3 additions & 3 deletions docs/functions/pgr_aStar.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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>)
```
```
6 changes: 3 additions & 3 deletions docs/functions/pgr_astarCost.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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>)
```
```
8 changes: 4 additions & 4 deletions docs/functions/pgr_bdAstar.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>)
```
```
6 changes: 3 additions & 3 deletions docs/functions/pgr_bdAstarCost.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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>)
```
```
6 changes: 3 additions & 3 deletions docs/functions/pgr_bdDijkstra.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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>)
```
```
6 changes: 3 additions & 3 deletions docs/functions/pgr_bdDijkstraCost.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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>)
```
```
6 changes: 3 additions & 3 deletions docs/functions/pgr_dijkstra.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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>)
```
```
6 changes: 3 additions & 3 deletions docs/functions/pgr_dijkstraCost.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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>)
```
```
Empty file removed functions/__init__.py
View file
Open in desktop
Empty file.
29 changes: 12 additions & 17 deletions metadata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion mkdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions pb_tool.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pgRoutingLayer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))

Expand Down
2 changes: 2 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
mkdocs
pb_tool
Loading