Merge pull request #2675 from cvvergara/resolve-pr-merge-conflicts-de…

…velop-with-main

Resolve pr merge conflicts develop with main

.github/dependabot.yml

@@ -4,3 +4,11 @@ updates:
   directory: "/"
   schedule:
       interval: "weekly"
+  target-branch: main
+
+#develop branch starts here
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+      interval: "weekly"
+  target-branch: develop

.github/workflows/boost_version.yml

@@ -131,5 +131,5 @@ jobs:
           sudo service postgresql start
           psql -c "CREATE DATABASE ___pgr___test___;"
           DIR=$(git rev-parse --show-toplevel)
-          bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "3.6.3"
+          bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "3.7.0"
           pg_prove  -Q -f --normalize --directives --recurse -U "${PG_RUNNER_USER}" -d ___pgr___test___ "pgtap"

.github/workflows/check-queries.yml

@@ -111,10 +111,13 @@ jobs:
       - name: Test documentation queries are up to date
         run: |
           sudo -u postgres createdb -p ${PGPORT}  pgr_test__db__test
-          TESTDIRS="version"
+          # queries that might change
+          # version: will catch the current version
+          # mincut: results change depending on boost
+          TESTDIRS="version mincut"
           for d in ${TESTDIRS}
           do
-            ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" -pguser runner -documentation -alg "${d}"
+            ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" -pguser runner -documentation -alg "docqueries/${d}"
           done
 
           ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}"

.github/workflows/macos.yml

@@ -54,7 +54,7 @@ jobs:
 
       - name: install deps
         run: |
-          brew install postgresql postgis boost
+          brew install postgresql@14 postgis boost
 
       - name: Configure
         run: |
@@ -66,24 +66,21 @@ jobs:
         run: |
           cd build
           make -j
-          sudo make install
+          make install
 
       - name: Install pgTAP
-        if: false
         run: |
           git clone https://github.com/theory/pgtap.git pgTapExtension
           cd pgTapExtension
           make -j
-          sudo make install
-          sudo cpan TAP::Parser::SourceHandler::pgTAP
-          sudo find /usr/local -name pg_prove
-          sudo ln -s  /usr/local/Cellar/perl/5.32.1_1/bin/pg_prove  symlink it into /usr/local/bin
+          make install
+          cpan TAP::Parser::SourceHandler::pgTAP
+          ln -s $(find `brew --prefix` -name pg_prove) symlink it into $(brew --prefix)/bin
 
       - name: Test
-        if: false
         run: |
-          export PATH=/usr/local/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH
-          pg_ctl -D /usr/local/var/postgres start
+          export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH
+          pg_ctl -D $(brew --prefix)/var/postgresql@14 start
           createuser -s postgres
           createdb ___pgr___test___
           bash ./tools/testers/pg_prove_tests.sh postgres 5432 Release

.github/workflows/ubuntu.yml

@@ -29,12 +29,9 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          psql: [11,12,13,14,15,16]
+          psql: [13,14,15,16]
           postgis: [3]
-          os: [ubuntu-latest, ububtu-22.04, ubuntu-20.04]
-          exclude:
-            - os: ubuntu-latest
-              psql: 11
+          os: [ubuntu-latest, ubuntu-22.04, ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/update.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          old_pgr: [3.6.2, 3.6.1, 3.6.0, 3.5.1, 3.5.0, 3.4.2, 3.4.1, 3.4.0, 3.3.5, 3.3.4, 3.3.3, 3.3.2, 3.3.1, 3.3.0, 3.0.6, 3.1.3, 3.2.0, 3.2.1, 3.2.2]
+          old_pgr: [3.6.3, 3.6.2, 3.6.1, 3.6.0, 3.5.1, 3.5.0, 3.4.2, 3.4.1, 3.4.0, 3.3.5, 3.3.4, 3.3.3, 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]
 
     steps:
       - uses: actions/checkout@v4
@@ -122,6 +122,6 @@ jobs:
         run: |
           sudo service postgresql start
           psql -p "${PGPORT}"  -d ___pgr___test___ -c "SELECT * FROM pgr_full_version();"
-          psql -p "${PGPORT}"  -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE  TO '3.6.3';"
+          psql -p "${PGPORT}"  -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE  TO '3.7.0';"
           psql -p "${PGPORT}"  -d ___pgr___test___ -c "SELECT * FROM pgr_full_version();"
           pg_prove  -Q -f --normalize --directives --recurse -U "${PG_RUNNER_USER}" -d ___pgr___test___ "pgtap"

CMakeLists.txt

@@ -18,7 +18,7 @@ include(pgr/BuildType)
 #---------------------------------------------
 #---------------------------------------------
 
-project(PGROUTING VERSION 3.6.3
+project(PGROUTING VERSION 3.7.0
     LANGUAGES C CXX )
 set(PROJECT_VERSION_DEV "")
 string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
@@ -31,8 +31,9 @@ set(PROJECT_LIB_NAME "${PROJECT_NAME_LOWER}-${PROJECT_LIB_VERSION}")
 
 string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d" UTC)
 
-set(MINORS 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.6)
+set(MINORS 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.6)
 set(OLD_SIGNATURES
+    3.6.3
     3.6.2
     3.6.1
     3.6.0
@@ -61,7 +62,7 @@ include(pgr/Configure)
 #---------------------------------------------
 set(DOXYGEN_MINIMUM_VERSION "1.7")
 set(SPHINX_MINIMUM_VERSION "4.0")
-set(POSTGRESQL_MINIMUM_VERSION "11.0.0")
+set(POSTGRESQL_MINIMUM_VERSION "13.0.0")
 set(BOOST_MINIMUM_VERSION "1.56.0")
 set(POSTGIS_MINIMUM_VERSION "3.0.0")
 
@@ -187,6 +188,7 @@ string(REPLACE "." ";" VERSION_LIST ${POSTGRESQL_VERSION})
 list(GET VERSION_LIST 0 POSTGRESQL_VERSION_MAYOR)
 list(GET VERSION_LIST 1 POSTGRESQL_VERSION_MINOR)
 
+# calculate math value of postgres version
 math(EXPR PGSQL_VERSION "${POSTGRESQL_VERSION_MAYOR} * 1000 + ${POSTGRESQL_VERSION_MINOR}")
 message(STATUS "PGSQL_VERSION=${PGSQL_VERSION}")
 

NEWS.md

@@ -1,11 +1,69 @@
 # pgRouting 3
 
 
-## pgRouting 3.6
+## pgRouting 3.7
 
 
 .. current
 
+### pgRouting 3.7.0 Release Notes
+
+To see all issues & pull requests closed by this release see the [Git closed
+milestone for 3.7.0
+](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22)
+
+**Support**
+
+* [#2656](https://github.com/pgRouting/pgrouting/pull/2656) Stop support of
+  PostgreSQL12 on pgrouting v3.7
+
+  * Stopping support of PostgreSQL 12
+  * CI does not test for PostgreSQL 12
+
+**New experimental functions**
+
+* Metrics
+
+  * pgr_betweennessCentrality
+
+**Official functions changes**
+
+* [#2605](https://github.com/pgRouting/pgrouting/pull/2605) Standarize
+  spanning tree functions output
+
+  * Functions:
+
+    * ``pgr_kruskalDD``
+    * ``pgr_kruskalDFS``
+    * ``pgr_kruskalBFS``
+    * ``pgr_primDD``
+    * ``pgr_primDFS``
+    * ``pgr_primBFS``
+
+  * Standarizing output columns to ``(seq, depth, start_vid, pred, node, edge, cost, agg_cost)``
+    * Added ``pred`` result columns.
+
+**Experimental promoted to proposed.**
+
+* [#2635](https://github.com/pgRouting/pgrouting/pull/2635) pgr_LineGraph
+  ignores directed flag and use negative values for identifiers.
+
+  * ``pgr_lineGraph``
+
+    * Promoted to **proposed** signature.
+    * Works for directed and undirected graphs.
+
+**Code enhancement**
+
+* [#2599](https://github.com/pgRouting/pgrouting/pull/2599) Driving distance
+  cleanup
+* [#2607](https://github.com/pgRouting/pgrouting/pull/2607) Read postgresql
+  data on C++
+* [#2614](https://github.com/pgRouting/pgrouting/pull/2614) Clang tidy does
+  not work
+
+## pgRouting 3.6
+
 
 ### pgRouting 3.6.3 Release Notes
 
@@ -104,91 +162,61 @@ milestone for 3.6.0
 * [#2547](https://github.com/pgRouting/pgrouting/pull/2547) Standarize output
   and modifying signature pgr_KSP
 
-
   * Result columns standarized to: ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
   * ``pgr_ksp`` (One to One)
-
     * Added ``start_vid`` and ``end_vid`` result columns.
-
   * New overload functions:
-
     * ``pgr_ksp`` (One to Many)
     * ``pgr_ksp`` (Many to One)
     * ``pgr_ksp`` (Many to Many)
     * ``pgr_ksp`` (Combinations)
-
 
 * [#2548](https://github.com/pgRouting/pgrouting/pull/2548) Standarize output
   pgr_drivingdistance
 
-
   * Standarizing output columns to ``(seq, depth, start_vid, pred, node, edge, cost, agg_cost)``
-
     * ``pgr_drivingdistance`` (Single vertex)
-
       * Added ``depth`` and ``start_vid`` result columns.
-
     * ``pgr_drivingdistance`` (Multiple vertices)
-
       * Result column name change: ``from_v`` to ``start_vid``.
       * Added ``depth`` and ``pred`` result columns.
-
 
 **Proposed functions changes**
 
 * [#2544](https://github.com/pgRouting/pgrouting/pull/2544) Standarize output
   and modifying signature pgr_withPointsDD
 
-
   * Signature change: ``driving_side`` parameter changed from named optional to
     unnamed compulsory **driving side**.
-
     * ``pgr_withPointsDD`` (`Single vertex`)
     * ``pgr_withPointsDD`` (`Multiple vertices`)
-
   * Standarizing output columns to ``(seq, depth, start_vid, pred, node, edge, cost, agg_cost)``
-
     * ``pgr_withPointsDD`` (`Single vertex`)
-
       * Added ``depth``, ``pred`` and ``start_vid`` column.
-
     * ``pgr_withPointsDD`` (`Multiple vertices`)
-
       * Added ``depth``, ``pred`` columns.
-
   * When ``details`` is ``false``:
-
     * Only points that are visited are removed, that is, points reached within the
       distance are included
-
   * Deprecated signatures
-
     * ``pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)``
     * ``pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)``
-
 
 * [#2546](https://github.com/pgRouting/pgrouting/pull/2546) Standarize output
   and modifying signature pgr_withPointsKSP
 
-
   * Standarizing output columns to ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
   * ``pgr_withPointsKSP`` (One to One)
-
     * Signature change: ``driving_side`` parameter changed from named optional to
       unnamed compulsory **driving side**.
     * Added ``start_vid`` and ``end_vid`` result columns.
-
   * New overload functions
-
     * ``pgr_withPointsKSP`` (One to Many)
     * ``pgr_withPointsKSP`` (Many to One)
     * ``pgr_withPointsKSP`` (Many to Many)
     * ``pgr_withPointsKSP`` (Combinations)
-
   * Deprecated signature
-
     * ``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char,boolean)``
-
 
 **C/C++ code enhancements**
 

README.md

@@ -56,6 +56,7 @@ The latest documentation: https://docs.pgrouting.org/latest
   * Compiling with Boost 1.56 up to Boost 1.74 requires C++ Compiler with C++03 or C++11 standard support
   * Compiling with Boost 1.75 requires C++ Compiler with C++14 standard support
 * Postgresql = Supported [version](https://www.postgresql.org/support/versioning/) by PostgreSQL
+  * Not supporting v12 & under
 * The Boost Graph Library (BGL) >= 1.56
 * CMake >= 3.2
 * 7.0 > Sphinx >= 4.0.0

ci/winnie/build_pgrouting.sh

@@ -162,7 +162,6 @@ cmake --version
 cmake -G "MSYS Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON \
  -DBOOST_ROOT:PATH="${BOOSTROOT_PATH}" \
  -DBoost_USE_STATIC_LIBS=ON \
- -DBoost_USE_MULTITHREADED=ON \
  -DCMAKE_BUILD_TYPE=Release \
  "../branches/${PGROUTING_VER}"
 

configuration.conf

@@ -46,6 +46,7 @@ planar              | Y | Y | Y
 dominator           | Y | Y | Y
 ordering            | Y | Y | Y
 circuits            | Y | Y | Y
+metrics             | Y | Y | Y
 #----------------------
 # SQL only directories
 #----------------------

doc/_static/page_history.js

@@ -4,7 +4,7 @@ function createInfo(file, newat, altnames = '') {
     this.altnames = altnames;
 }
 
-var versionsArr = ['3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0'];
+var versionsArr = ['3.7', '3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0'];
 var unsuportedArr = ['2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0'];
 var titles = [
     {k: 'en', v: ['Supported versions', 'Unsupported versions']},
@@ -14,6 +14,8 @@ var titles = [
 
 
 var newpages = [
+    {v: '3.7', pages: ['metrics-family', 'pgr_betweennessCentrality']},
+
     {v: '3.4', pages: ['TRSP-family', 'pgr_withPointsVia', 'pgr_trsp_withPoints', 'pgr_trspVia_withPoints',
             'pgr_trspVia', 'pgr_hawickCircuits', 'pgr_findCloseEdges', 'pgr_cuthillMckeeOrdering', 'ordering-family',
             'migration']},

doc/allpairs/pgr_floydWarshall.rst

@@ -60,7 +60,7 @@ Signatures
 
 :Example: For a directed subgraph with edges :math:`\{1, 2, 3, 4\}`.
 
-.. literalinclude:: doc-floydWarshall.queries
+.. literalinclude:: floydWarshall.queries
    :start-after: -- q1
    :end-before: -- q2
 

doc/allpairs/pgr_johnson.rst

@@ -58,7 +58,7 @@ Signatures
 
 :Example: For a directed subgraph with edges :math:`\{1, 2, 3, 4\}`.
 
-.. literalinclude:: doc-johnson.queries
+.. literalinclude:: johnson.queries
    :start-after: -- q1
    :end-before: -- q2
 

doc/alpha_shape/pgr_alphaShape.rst

@@ -75,7 +75,7 @@ Signatures
 :Example: passing a geometry collection with spoon radius :math:`1.5` using the
           return variable ``geom``
 
-.. literalinclude:: doc-pgr_alphashape.queries
+.. literalinclude:: alphashape.queries
    :start-after: -- q1
    :end-before: -- q2