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.

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

Issue 2656 stop support of postgre sql12 on pgrouting v3.7 #2657

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 1 addition & 8 deletions .github/workflows/boost_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,6 @@ jobs:
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \
$(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'

- name: Install python
uses: actions/setup-python@v4
with:
python-version: '3.x'

- name: Install dependencies
run: |
sudo apt-get update
Expand All @@ -111,8 +106,6 @@ jobs:
postgresql-${PGVER}-postgis-${PGIS}-scripts \
postgresql-server-dev-${PGVER}

python -m pip install --upgrade pip
pip install -r requirements.txt
wget https://sourceforge.net/projects/boost/files/boost/1.${{ matrix.boost_minor }}.0/boost_1_${{ matrix.boost_minor }}_0.tar.bz2
#wget https://dl.bintray.com/boostorg/release/1.${{ matrix.boost_minor }}.0/source/boost_1_${{ matrix.boost_minor }}_0.tar.bz2
sudo tar --bzip2 -xf boost_1_${{ matrix.boost_minor }}_0.tar.bz2
Expand All @@ -124,7 +117,7 @@ jobs:
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
mkdir build
cd build
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DWITH_DOC=OFF ..
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug ..

- name: Build
run: |
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/check-queries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,10 @@ 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 "docqueries/${d}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
strategy:
fail-fast: false
matrix:
psql: [12,13,14,15,16]
psql: [13,14,15,16]
postgis: [3]
os: [ubuntu-latest, ubuntu-20.04]
os: [ubuntu-latest, ubuntu-22.04, ubuntu-20.04]

steps:
- uses: actions/checkout@v4
Expand Down
24 changes: 12 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ include(pgr/Configure)
#---------------------------------------------
set(DOXYGEN_MINIMUM_VERSION "1.7")
set(SPHINX_MINIMUM_VERSION "4.0")
set(POSTGRESQL_MINIMUM_VERSION "9.2.0")
set(POSTGRESQL_MINIMUM_VERSION "13.0.0")
set(BOOST_MINIMUM_VERSION "1.56.0")
set(POSTGIS_MINIMUM_VERSION "2.0.0")
set(POSTGIS_MINIMUM_VERSION "3.0.0")

message(STATUS "DOXYGEN_MINIMUM_VERSION=${DOXYGEN_MINIMUM_VERSION}")
message(STATUS "SPHINX_MINIMUM_VERSION=${SPHINX_MINIMUM_VERSION}")
Expand Down Expand Up @@ -172,25 +172,25 @@ endif()
# PostgreSQL
#---------------------------------------------
#---------------------------------------------
find_package(PostgreSQL)
if(NOT POSTGRESQL_FOUND OR NOT POSTGRESQL_VERSION_STRING)
message(FATAL_ERROR "PostgreSQL not found - Please check your PostgreSQL installation.")
endif()
find_package(PostgreSQL "${POSTGRESQL_MINIMUM_VERSION}")

# removing type of release on postgres version
# for XbetaY XalphaY XrcY -> X.Y
string(REGEX REPLACE "([0-9]+)[beta|alpha|rc|devel].*" "\\1.0" POSTGRESQL_VERSION_STRING ${POSTGRESQL_VERSION_STRING})
message(STATUS "POSTGRESQL_VERSION_STRING=${POSTGRESQL_VERSION_STRING}")

# calcualte mayor.micro
STRING(REGEX MATCH "([0-9]+)\.([0-9]+)" POSTGRESQL_VERSION "${POSTGRESQL_VERSION_STRING}")
message(STATUS "POSTGRESQL_VERSION=${POSTGRESQL_VERSION}")

#for X.Y.Z -> XY Y<10
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+).*" "\\1\\2" PGSQL_VERSION ${POSTGRESQL_VERSION})
#message(STATUS "PGSQL_VERSION=${PGSQL_VERSION}")
# split mayor minor
string(REPLACE "." ";" VERSION_LIST ${POSTGRESQL_VERSION})
list(GET VERSION_LIST 0 POSTGRESQL_VERSION_MAYOR)
list(GET VERSION_LIST 1 POSTGRESQL_VERSION_MINOR)

if("${POSTGRESQL_VERSION}" VERSION_LESS "${POSTGRESQL_MINIMUM_VERSION}")
message(FATAL_ERROR " PostgreSQL ${POSTGRESQL_MINIMUM_VERSION} or greater is required.")
endif("${POSTGRESQL_VERSION}" VERSION_LESS "${POSTGRESQL_MINIMUM_VERSION}")
# calculate math value of postgres version
math(EXPR PGSQL_VERSION "${POSTGRESQL_VERSION_MAYOR} * 1000 + ${POSTGRESQL_VERSION_MINOR}")
message(STATUS "PGSQL_VERSION=${PGSQL_VERSION}")

#-------
include_directories(SYSTEM ${POSTGRESQL_INCLUDE_DIR})
Expand Down
8 changes: 8 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ 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
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ci/winnie/build_pgrouting.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
8 changes: 8 additions & 0 deletions doc/src/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ 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>`__

.. rubric:: 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

.. rubric:: New experimental functions

* Metrics
Expand Down
51 changes: 0 additions & 51 deletions tools/developer/translate.sh

This file was deleted.

Loading