Skip to content

Commit c9ff91d

Browse files
cvvergaracvvergara
committed
tasks for issue 1095
1 parent 1360698 commit c9ff91d

File tree

10 files changed

+101
-6436
lines changed

10 files changed

+101
-6436
lines changed

‎NEWS‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,40 @@
22
pgRouting 2.6.1 Release Notes
33
-------------------------------------------------------------------------------
44

5+
To see the issues closed by this release see the [Git closed milestone for 2.6.1 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.1%22%20) on Github.
6+
7+
* Fixes server crash on several functions.
8+
9+
* pgr_floydWarshall
10+
* pgr_johnson
11+
* pgr_astar
12+
* pgr_bdAstar
13+
* pgr_bdDijstra
14+
* pgr_alphashape
15+
* pgr_dijkstraCostMatrix
16+
* pgr_dijkstra
17+
* pgr_dijkstraCost
18+
* pgr_drivingDistance
19+
* pgr_KSP
20+
* pgr_dijkstraVia (proposed)
21+
* pgr_boykovKolmogorov (proposed)
22+
* pgr_edgeDisjointPaths (proposed)
23+
* pgr_edmondsKarp (proposed)
24+
* pgr_maxCardinalityMatch (proposed)
25+
* pgr_maxFlow (proposed)
26+
* pgr_withPoints (proposed)
27+
* pgr_withPointsCost (proposed)
28+
* pgr_withPointsKSP (proposed)
29+
* pgr_withPointsDD (proposed)
30+
* pgr_withPointsCostMatrix (proposed)
31+
* pgr_contractGraph (experimental)
32+
* pgr_pushRelabel (experimental)
33+
* pgr_vrpOneDepot (experimental)
34+
* pgr_gsoc_vrppdtw (experimental)
35+
* Fixes for deprecated functions where also applied but not tested
36+
37+
* Removed compilation warning for g++8
38+
* Fixed a fallthrugh on Astar and bdAstar.
539

640

741
pgRouting 2.6.0 Release Notes
@@ -74,7 +108,6 @@ To see the issues closed by this release see the [Git closed milestone for 2.5.4
74108

75109
* Removed compilation warning for g++8
76110
* Fixed a fallthrugh on Astar and bdAstar.
77-
>>>>>>> 83b8d30... updating NEWS VERSION, script & queries with current results
78111

79112

80113
pgRouting 2.5.3 Release Notes

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6797-101c6bb release/2.6
1+
6798-1360698 release/2.6

‎doc/queries/doc-pgr_version.queries‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SET
66
SELECT version FROM pgr_version();
77
version
88
---------
9-
2.6.0
9+
2.6.1
1010
(1 row)
1111

1212
-- q2

‎doc/src/release_notes.rst‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,40 @@ To see the full list of changes check the list of `Git commits <https://github.c
4848
pgRouting 2.6.1 Release Notes
4949
-------------------------------------------------------------------------------
5050

51+
To see the issues closed by this release see the `Git closed milestone for 2.6.1 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.1%22%20>`_ on Github.
52+
53+
* Fixes server crash on several functions.
54+
55+
* pgr_floydWarshall
56+
* pgr_johnson
57+
* pgr_astar
58+
* pgr_bdAstar
59+
* pgr_bdDijstra
60+
* pgr_alphashape
61+
* pgr_dijkstraCostMatrix
62+
* pgr_dijkstra
63+
* pgr_dijkstraCost
64+
* pgr_drivingDistance
65+
* pgr_KSP
66+
* pgr_dijkstraVia (proposed)
67+
* pgr_boykovKolmogorov (proposed)
68+
* pgr_edgeDisjointPaths (proposed)
69+
* pgr_edmondsKarp (proposed)
70+
* pgr_maxCardinalityMatch (proposed)
71+
* pgr_maxFlow (proposed)
72+
* pgr_withPoints (proposed)
73+
* pgr_withPointsCost (proposed)
74+
* pgr_withPointsKSP (proposed)
75+
* pgr_withPointsDD (proposed)
76+
* pgr_withPointsCostMatrix (proposed)
77+
* pgr_contractGraph (experimental)
78+
* pgr_pushRelabel (experimental)
79+
* pgr_vrpOneDepot (experimental)
80+
* pgr_gsoc_vrppdtw (experimental)
81+
* Fixes for deprecated functions where also applied but not tested
82+
83+
* Removed compilation warning for g++8
84+
* Fixed a fallthrugh on Astar and bdAstar.
5185

5286
.. _changelog_2_6_0:
5387

@@ -122,7 +156,6 @@ To see the issues closed by this release see the `Git closed milestone for 2.5.4
122156

123157
* Removed compilation warning for g++8
124158
* Fixed a fallthrugh on Astar and bdAstar.
125-
>>>>>>> 83b8d30... updating NEWS VERSION, script & queries with current results
126159

127160
.. _changelog_2_5_3:
128161

‎include/c_types/line_graph_full_rt.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4141

4242
// for bool
4343
#ifdef __GNUC__
44+
#if __GNUC__ > 5
45+
#pragma GCC diagnostic ignored "-Wpedantic"
46+
#else
4447
#pragma GCC diagnostic ignored "-pedantic"
4548
#endif
49+
#endif
4650

4751
#include <postgres.h>
4852

‎include/c_types/trsp_types.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@
3232

3333
// for bool
3434
#ifdef __GNUC__
35+
#if __GNUC__ > 5
36+
#pragma GCC diagnostic ignored "-Wpedantic"
37+
#else
3538
#pragma GCC diagnostic ignored "-pedantic"
3639
#endif
40+
#endif
3741

3842
#include <postgres.h>
3943

‎sql/sigs/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
SET(OLD_SIGNATURES
2+
2.6.0
3+
24
2.5.4
35
2.5.3
46
2.5.2

‎tools/release-scripts/check-release.sh‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,12 @@ echo "- src/common/test/doc-pgr_version.result"
241241

242242
if [[ -n $DEBUG ]]; then
243243
echo "\`\`\`"
244-
echo "cat src/common/test/doc-pgr_version.result | grep \"$MAYOR.$MINOR.$MICRO\""
244+
echo "cat test/common/doc-pgr_version.result | grep \"$MAYOR.$MINOR.$MICRO\""
245245
echo "\`\`\`"
246246
fi
247247

248-
if [[ $(cat src/common/test/doc-pgr_version.result | grep "$MAYOR.$MINOR.$MICRO") != " $MAYOR.$MINOR.$MICRO" ]]; then
249-
error_msg "src/common/test/doc-pgr_version.result is not $MAYOR.$MINOR.$MICRO"
248+
if [[ $(cat test/common/doc-pgr_version.result | grep "$MAYOR.$MINOR.$MICRO") != " $MAYOR.$MINOR.$MICRO" ]]; then
249+
error_msg "test/common/doc-pgr_version.result is not $MAYOR.$MINOR.$MICRO"
250250
exit 1
251251
else
252252
echo " - [x] src/common/test/doc-pgr_version.result"
@@ -275,6 +275,8 @@ echo
275275
echo "### Checking signature files exist"
276276
echo
277277
#---------------------------------------------------------------------
278+
test_file 2.6.1
279+
test_file 2.6.0
278280
test_file 2.5.4
279281
test_file 2.5.3
280282
test_file 2.5.2
@@ -318,7 +320,9 @@ echo - [x] completed local builds
318320
echo "### checking the signature files dont change"
319321
#---------------------------------------------------------------------
320322

321-
sh tools/release-scripts/get_signatures.sh 2.5.4 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
323+
sh tools/release-scripts/get_signatures.sh 2.6.1 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
324+
test_file 2.6.0
325+
test_file 2.5.4
322326
test_file 2.5.3
323327
test_file 2.5.2
324328
test_file 2.5.1

0 commit comments

Comments
 (0)