Skip to content

Commit f21e5bd

Browse files
cvvergaracvvergara
authored
Release tasks 1 (#2370)
* Build changes - Removing "-dev" - adding 3.3.2 to list of past signatures * CI task - adjust to what needs to be tested for update * [queries] updating queries to version name * [sql] standarizing deprecated messages * [tools] adjusting taptest for single tests * [queries][trsp] adjusting result to standarized messages * [CI] postgres 9.6 is no longer supported, not testing for update * [pgtap] using function instead of procedure * [ordering][pgtap] ignoring test on postgres14 * [circuits][doc] renaming pgr_hawickCircuits file * [circuits] [doc] fixing issues on signatures because of admonition * [withPointsVia][pgtap] does not exist on v3.3 or under * [trsp][tap] Reducing number of tests on Postgres 10 & 11 * [conf.py.in] [doc] fixing issues on signatures because of admonition * [_static] [doc] fixing issues on signatures because of admonition * [allpairs] [doc] fixing issues on signatures because of admonition * [alpha_shape] [doc] fixing issues on signatures because of admonition * [astar] [doc] fixing issues on signatures because of admonition * [bdAstar] [doc] fixing issues on signatures because of admonition * [bdDijkstra] [doc] fixing issues on signatures because of admonition * [bellman_ford] [doc] fixing issues on signatures because of admonition * [breadthFirstSearch] [doc] fixing issues on signatures because of admonition * [pgtap] reducing number of tests on Posgres 10 & 11 * [chinese] [doc] fixing issues on signatures because of admonition * [traversal] [doc] fixing issues on signatures because of admonition * [ordering][pgtap] ignoring test on postgres14
1 parent 8a41169 commit f21e5bd

54 files changed

Lines changed: 340 additions & 304 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ubuntu.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
psql: [9.6,10,11,12,13,14]
21+
psql: [10,11,12,13,14]
2222
postgis: [2.5,3]
2323
os: [ubuntu-latest, ubuntu-18.04]
2424
exclude:

‎.github/workflows/update.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
old_pgr: [3.3.1 3.3.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.0.6, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.2.0, 3.2.1, 3.2.1]
21+
old_pgr: [3.3.2 3.3.1 3.3.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.0.6, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.2.0, 3.2.1, 3.2.2]
2222

2323
steps:
2424
- uses: actions/checkout@v3

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ include(pgr/BuildType)
2020

2121
project(PGROUTING VERSION 3.4.0
2222
LANGUAGES C CXX )
23-
set(PROJECT_VERSION_DEV "-dev")
23+
set(PROJECT_VERSION_DEV "")
2424
string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
2525

2626
include(pgr/GitInfo)
@@ -33,7 +33,7 @@ string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d")
3333

3434
set(MINORS 3.4 3.3 3.2 3.1 3.0 2.6)
3535
set(OLD_SIGNATURES
36-
3.3.1 3.3.0
36+
3.3.2 3.3.1 3.3.0
3737
3.2.2 3.2.1 3.2.0
3838
3.1.4 3.1.3 3.1.2 3.1.1 3.1.0
3939
3.0.6 3.0.5 3.0.4 3.0.3 3.0.2 3.0.1 3.0.0

‎doc/_static/custom.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@ div.signatures {
5151

5252
code.literal {
5353
color: #404040;
54-
background-color: #fbfbfb;
54+
background-color: #e8e8e8;
55+
font-size: 100%
5556
}

‎doc/allpairs/pgr_floydWarshall.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Signatures
6767
.. admonition:: \ \
6868
:class: signatures
6969

70-
pgr floydWarshall(`Edges SQL`_ [, directed])
70+
pgr floydWarshall(`Edges SQL`_, [``directed``])
7171

7272
| RETURNS SET OF |matrix-result|
7373
| OR EMPTY SET

‎doc/allpairs/pgr_johnson.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Signatures
6666
.. admonition:: \ \
6767
:class: signatures
6868

69-
pgr johnson(`Edges SQL`_ [, directed])
69+
pgr johnson(`Edges SQL`_, [``directed``])
7070

7171
| RETURNS SET OF |matrix-result|
7272
| OR EMPTY SET

‎doc/alpha_shape/pgr_alphaShape.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ Signatures
8282
.. admonition:: \ \
8383
:class: signatures
8484

85-
pgr_alphaShape(**geometry**, [alpha])
86-
RETURNS geometry
85+
| pgr_alphaShape(**geometry**, [alpha])
86+
87+
| RETURNS geometry
8788
8889

8990
:Example: passing a geometry collection with spoon radius :math:`1.5` using the

‎doc/astar/pgr_aStar.rst‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,14 @@ Signatures
9292
.. admonition:: \ \
9393
:class: signatures
9494

95-
| pgr_aStar(`Edges SQL`_, **start vid**, **end vid**
96-
| [, directed] [, heuristic] [, factor] [, epsilon])
97-
| pgr_aStar(`Edges SQL`_, **start vid**, **end vids**
98-
| [, directed] [, heuristic] [, factor] [, epsilon])
99-
| pgr_aStar(`Edges SQL`_, **start vids**, **end vid**
100-
| [, directed] [, heuristic] [, factor] [, epsilon])
101-
| pgr_aStar(`Edges SQL`_, **start vids**, **end vids**
102-
| [, directed] [, heuristic] [, factor] [, epsilon])
103-
| pgr_aStar(`Edges SQL`_, `Combinations SQL`_
104-
| [, directed] [, heuristic] [, factor] [, epsilon])
105-
| RETURNS SET OF
106-
| (seq, path_seq [, start_vid] [, end_vid], node, edge, cost, agg_cost)
95+
| pgr_aStar(`Edges SQL`_, **start vid**, **end vid**, [**options**])
96+
| pgr_aStar(`Edges SQL`_, **start vid**, **end vids**, [**options**])
97+
| pgr_aStar(`Edges SQL`_, **start vids**, **end vid**, [**options**])
98+
| pgr_aStar(`Edges SQL`_, **start vids**, **end vids**, [**options**])
99+
| pgr_aStar(`Edges SQL`_, `Combinations SQL`_, [**options**])
100+
| **options:** ``[directed, heuristic, factor, epsilon]``
101+
102+
| RETURNS SET OF |old-generic-result|
107103
| OR EMPTY SET
108104
109105
Optional parameters are `named parameters` and have a default value.
@@ -117,10 +113,10 @@ One to One
117113
.. admonition:: \ \
118114
:class: signatures
119115

120-
| pgr_aStar(`Edges SQL`_, **start vid**, **end vid**
121-
| [, directed] [, heuristic] [, factor] [, epsilon])
116+
| pgr_aStar(`Edges SQL`_, **start vid**, **end vid**, [**options**])
117+
| **options:** ``[directed, heuristic, factor, epsilon]``
122118
123-
| RETURNS SET OF (seq, path_seq, node, edge, cost, agg_cost)
119+
| RETURNS SET OF |result-1-1|
124120
| OR EMPTY SET
125121
126122
:Example: From vertex :math:`6` to vertex :math:`12` on a **directed** graph
@@ -139,9 +135,10 @@ One to Many
139135
.. admonition:: \ \
140136
:class: signatures
141137

142-
| pgr_aStar(`Edges SQL`_, **start vid**, **end vids**
143-
| [, directed] [, heuristic] [, factor] [, epsilon])
144-
| RETURNS SET OF (seq, path_seq, end_vid, node, edge, cost, agg_cost)
138+
| pgr_aStar(`Edges SQL`_, **start vid**, **end vids**, [**options**])
139+
| **options:** ``[directed, heuristic, factor, epsilon]``
140+
141+
| RETURNS SET OF |result-1-m|
145142
| OR EMPTY SET
146143
147144
:Example: From vertex :math:`6` to vertices :math:`\{10, 12\}` on a **directed**
@@ -160,9 +157,10 @@ Many to One
160157
.. admonition:: \ \
161158
:class: signatures
162159

163-
| pgr_aStar(`Edges SQL`_, **start vids**, **end vid**
164-
| [, directed] [, heuristic] [, factor] [, epsilon])
165-
| RETURNS SET OF (seq, path_seq, start_vid, node, edge, cost, agg_cost)
160+
| pgr_aStar(`Edges SQL`_, **start vids**, **end vid**, [**options**])
161+
| **options:** ``[directed, heuristic, factor, epsilon]``
162+
163+
| RETURNS SET OF |result-m-1|
166164
| OR EMPTY SET
167165
168166
:Example: From vertices :math:`\{6, 8\}` to vertex :math:`10` on an
@@ -181,9 +179,10 @@ Many to Many
181179
.. admonition:: \ \
182180
:class: signatures
183181

184-
| pgr_aStar(`Edges SQL`_, **start vids**, **end vids**
185-
| [, directed] [, heuristic] [, factor] [, epsilon])
186-
| RETURNS (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)
182+
| pgr_aStar(`Edges SQL`_, **start vids**, **end vids**, [**options**])
183+
| **options:** ``[directed, heuristic, factor, epsilon]``
184+
185+
| RETURNS SET OF |result-m-m|
187186
| OR EMPTY SET
188187
189188
:Example: From vertices :math:`\{6, 8\}` to vertices :math:`\{10, 12\}` on a
@@ -202,9 +201,10 @@ Combinations
202201
.. admonition:: \ \
203202
:class: signatures
204203

205-
| pgr_aStar(`Edges SQL`_, `Combinations SQL`_
206-
| [, directed] [, heuristic] [, factor] [, epsilon])
207-
| RETURNS (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)
204+
| pgr_aStar(`Edges SQL`_, `Combinations SQL`_, [**options**])
205+
| **options:** ``[directed, heuristic, factor, epsilon]``
206+
207+
| RETURNS SET OF |result-m-m|
208208
| OR EMPTY SET
209209
210210
:Example: Using a combinations table on a **directed** graph with factor

‎doc/astar/pgr_aStarCost.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Signatures
8787
| pgr_aStarCost(`Edges SQL`_, **start vids**, **end vid**, [**options**])
8888
| pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [**options**])
8989
| pgr_aStarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])
90-
| **options:** ``[directed, heuristic, factor, epsilon]``
90+
| **options:** ``[directed, heuristic, factor, epsilon]``
9191
9292
| RETURNS SET OF |matrix-result|
9393
| OR EMPTY SET
@@ -124,7 +124,7 @@ One to Many
124124
:class: signatures
125125

126126
| pgr_aStarCost(`Edges SQL`_, **start vid**, **end vids**, [**options**])
127-
| **options:** ``[directed, heuristic, factor, epsilon]``
127+
| **options:** ``[directed, heuristic, factor, epsilon]``
128128
129129
| RETURNS SET OF |matrix-result|
130130
| OR EMPTY SET
@@ -146,7 +146,7 @@ Many to One
146146
:class: signatures
147147

148148
| pgr_aStarCost(`Edges SQL`_, **start vids**, **end vid**, [**options**])
149-
| **options:** ``[directed, heuristic, factor, epsilon]``
149+
| **options:** ``[directed, heuristic, factor, epsilon]``
150150
151151
| RETURNS SET OF |matrix-result|
152152
| OR EMPTY SET
@@ -168,7 +168,7 @@ Many to Many
168168
:class: signatures
169169

170170
| pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [options])
171-
| **options:** ``[directed, heuristic, factor, epsilon]``
171+
| **options:** ``[directed, heuristic, factor, epsilon]``
172172
173173
| RETURNS SET OF |matrix-result|
174174
| OR EMPTY SET
@@ -190,7 +190,7 @@ Combinations
190190
:class: signatures
191191

192192
| pgr_aStarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])
193-
| **options:** ``[directed, heuristic, factor, epsilon]``
193+
| **options:** ``[directed, heuristic, factor, epsilon]``
194194
195195
| RETURNS SET OF |matrix-result|
196196
| OR EMPTY SET

‎doc/astar/pgr_aStarCostMatrix.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Signatures
7575
:class: signatures
7676

7777
| pgr_aStarCostMatrix(`Edges SQL`_, **start vids**, [**options**])
78-
| **options:** ``[directed, heuristic, factor, epsilon]``
78+
| **options:** ``[directed, heuristic, factor, epsilon]``
7979
8080
| RETURNS SET OF |matrix-result|
8181
| OR EMPTY SET

0 commit comments

Comments
 (0)