Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Pumpup to 3.5.1 #2484

Merged
merged 3 commits into from
Mar 13, 2023
Merged

Pumpup to 3.5.1 #2484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c272f3
[admin] pumpup to 3.5.1
cvvergara Mar 8, 2023
4eb4fd2
[doc] using bootstrap_version 2 because 3+ does not do dropdowns
cvvergara Mar 8, 2023
4884ea7
Update locale: commit 4eb4fd2a6
github-actions[bot] Mar 10, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/boost_version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,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.5.0"
bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "3.5.1"
pg_prove -Q -f --normalize --directives --recurse -U "${PG_RUNNER_USER}" -d ___pgr___test___ "pgtap"
4 changes: 2 additions & 2 deletions .github/workflows/update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
old_pgr: [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]
old_pgr: [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@v3
Expand Down Expand Up @@ -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.5.0';"
psql -p "${PGPORT}" -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE TO '3.5.1';"
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"
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include(pgr/BuildType)
#---------------------------------------------
#---------------------------------------------

project(PGROUTING VERSION 3.5.0
project(PGROUTING VERSION 3.5.1
LANGUAGES C CXX )
set(PROJECT_VERSION_DEV "")
string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
Expand All @@ -33,6 +33,7 @@ string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d" UTC)

set(MINORS 3.5 3.4 3.3 3.2 3.1 3.0 2.6)
set(OLD_SIGNATURES
3.5.0
3.4.2
3.4.1
3.4.0
Expand Down
5 changes: 5 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
pgRouting 3.5.1 Release Notes
-------------------------------------------------------------------------------

No Changes Yet

pgRouting 3.5.0 Release Notes
-------------------------------------------------------------------------------

Expand Down
6 changes: 5 additions & 1 deletion doc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,11 @@ if (DOC_USE_BOOTSTRAP)
set(SPHINX_INCLUDE "import sphinx_bootstrap_theme")
set(SPHINX_THEME "bootstrap")
set(SPHINX_THEME_DIR "sphinx_bootstrap_theme.get_html_theme_path()")
set(SPHINX_THEME_OPTIONS "'source_link_position': \"none\",")
set(SPHINX_THEME_OPTIONS "
'navbar_class': \"navbar\",
'source_link_position': \"nav\",
'bootstrap_version': \"2\",
")
else()
set(SPHINX_INCLUDE "")
set(SPHINX_THEME "haiku")
Expand Down
6 changes: 6 additions & 0 deletions doc/src/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ To see the full list of changes check the list of `Git commits
.. contents:: Contents
:local:


pgRouting 3.5.1 Release Notes
-------------------------------------------------------------------------------

No Changes Yet

pgRouting 3.5.0 Release Notes
-------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion docqueries/version/doc-full_version.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SET
SELECT version, library FROM pgr_full_version();
version | library
---------+-----------------
3.5.0 | pgrouting-3.5.0
3.5.1 | pgrouting-3.5.1
(1 row)

/* -- q2 */
Expand Down
2 changes: 1 addition & 1 deletion docqueries/version/doc-version.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SET
SELECT pgr_version();
pgr_version
-------------
3.5.0
3.5.1
(1 row)

/* -- q2 */
Expand Down
2 changes: 1 addition & 1 deletion locale/en/LC_MESSAGES/index.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.5.0-dev
# Copyright (C) pgRouting Contributors - Version v3.5.1
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
#
Expand Down
12 changes: 9 additions & 3 deletions locale/en/LC_MESSAGES/pgrouting_doc_strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.5.0-dev
# Copyright (C) pgRouting Contributors - Version v3.5.1
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
#
Expand All @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pgRouting v3.4.0-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-02 02:00+0000\n"
"POT-Creation-Date: 2023-03-10 15:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -6877,7 +6877,7 @@ msgid "Upgrading the database"
msgstr ""

msgid ""
"To upgrade pgRouting in the database to version 3.5.0 use the following "
"To upgrade pgRouting in the database to version 3.5.1 use the following "
"command:"
msgstr ""

Expand Down Expand Up @@ -16603,6 +16603,12 @@ msgid ""
"<https://github.com/pgRouting/pgrouting/commits>`_ on Github."
msgstr ""

msgid "pgRouting 3.5.1 Release Notes"
msgstr ""

msgid "No Changes Yet"
msgstr ""

msgid "pgRouting 3.5.0 Release Notes"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion locale/es/LC_MESSAGES/index.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.5.0-dev
# Copyright (C) pgRouting Contributors - Version v3.5.1
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
#
Expand Down
2 changes: 1 addition & 1 deletion locale/es/LC_MESSAGES/pgrouting_doc_strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.5.0-dev
# Copyright (C) pgRouting Contributors - Version v3.5.1
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
# Pedro Jose Rios Vergara <jose@georepublic.de>, 2022.
Expand Down
2 changes: 1 addition & 1 deletion locale/ja/LC_MESSAGES/index.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.5.0-dev
# Copyright (C) pgRouting Contributors - Version v3.5.1
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
#
Expand Down
2 changes: 1 addition & 1 deletion locale/ja/LC_MESSAGES/pgrouting_doc_strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# #-#-#-#-# allpairs-family.po (pgRouting v3.4.0-dev) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.5.0-dev
# Copyright (C) pgRouting Contributors - Version v3.5.1
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
# Vicky Vergara <vicky@georepublic.de>, 2020
Expand Down
2 changes: 1 addition & 1 deletion locale/ko/LC_MESSAGES/index.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.4.0-dev
# Copyright (C) pgRouting Contributors - Version v3.5.1
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
Expand Down
2 changes: 1 addition & 1 deletion locale/ko/LC_MESSAGES/pgrouting_doc_strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.4.0
# Copyright (C) pgRouting Contributors - Version v3.5.1
# This file is distributed under the same license as the pgRouting package.
# Regina Obe <regina@arrival3d.com>, 2022.
# Hyung-Gyu Ryoo <hyunggyu.ryoo@gmail.com>, 2022.
Expand Down
2 changes: 1 addition & 1 deletion locale/pot/index.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.5.0-dev
# Copyright (C) pgRouting Contributors - Version v3.5.1
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
Expand Down
14 changes: 10 additions & 4 deletions locale/pot/pgrouting_doc_strings.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.5.0
# Copyright (C) pgRouting Contributors - Version v3.5.1
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: pgRouting v3.5.0\n"
"Project-Id-Version: pgRouting v3.5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-03-02 02:00+0000\n"
"POT-Creation-Date: 2023-03-10 15:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -5821,7 +5821,7 @@ msgstr ""
msgid "Upgrading the database"
msgstr ""

msgid "To upgrade pgRouting in the database to version 3.5.0 use the following command:"
msgid "To upgrade pgRouting in the database to version 3.5.1 use the following command:"
msgstr ""

msgid "More information can be found in https://www.postgresql.org/docs/current/sql-createextension.html"
Expand Down Expand Up @@ -13072,6 +13072,12 @@ msgstr ""
msgid "To see the full list of changes check the list of `Git commits <https://github.com/pgRouting/pgrouting/commits>`_ on Github."
msgstr ""

msgid "pgRouting 3.5.1 Release Notes"
msgstr ""

msgid "No Changes Yet"
msgstr ""

msgid "pgRouting 3.5.0 Release Notes"
msgstr ""

Expand Down
10 changes: 7 additions & 3 deletions tools/developer/pumpup_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,11 @@ echo "pumpup from ${OLD_VERSION}${KIND} to ${NEW_VERSION}${NEW_KIND}"
# set version to new version
perl -pi -e 's/project\(PGROUTING VERSION (.*)$/project\(PGROUTING VERSION '"${NEW_VERSION}"'/g' CMakeLists.txt
perl -pi -e 's/set\(PROJECT_VERSION_DEV(.*)$/set\(PROJECT_VERSION_DEV "'"${NEW_KIND}"'"\)/g' CMakeLists.txt
perl -pi -e 's/set\(MINORS(.*)$/set\(MINORS '"${NEW_MAYOR}"'.'"${NEW_MINOR}"'$1/g' CMakeLists.txt
perl -pi -e 's/OLD_SIGNATURES$/OLD_SIGNATURES\n '"${OLD_VERSION}"' /g' CMakeLists.txt

perl -pi -e 's/OLD_SIGNATURES$/OLD_SIGNATURES\n '"${OLD_VERSION}"'/g' CMakeLists.txt
if [ "${WHAT_NEXT}" != "micro" ]
then
perl -pi -e 's/set\(MINORS(.*)$/set\(MINORS '"${NEW_MAYOR}"'.'"${NEW_MINOR}"'$1/g' CMakeLists.txt
fi
# --------------------------------------------
# --------------------------------------------
# sql directory
Expand Down Expand Up @@ -114,6 +116,7 @@ No Changes Yet

$1/g' doc/src/release_notes.rst

# adding to news
tools/release-scripts/notes2news.pl

# --------------------------------------------
Expand All @@ -135,6 +138,7 @@ perl -pi -e 's/'"${OLD_VERSION}"'/'"${NEW_VERSION}"'/' docqueries/version/*.resu

perl -pi -e 's/'"${OLD_VERSION}"'/'"${NEW_VERSION}"'/g' .github/workflows/update.yml
perl -pi -e 's/old_pgr: \[/old_pgr: \['"${OLD_VERSION}"', /g' .github/workflows/update.yml
perl -pi -e 's/'"${OLD_VERSION}"'/'"${NEW_VERSION}"'/g' .github/workflows/boost_version.yml

# --------------------------------------------
# Include file in CMakeLists.txt
Expand Down
2 changes: 1 addition & 1 deletion tools/testers/pg_prove_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ echo "$PGPORT"

pushd ./tools/testers/ || exit 1

bash setup_db.sh "${PGPORT}" "${PGDATABASE}" "${PGUSER}" "3.5.0"
bash setup_db.sh "${PGPORT}" "${PGDATABASE}" "${PGUSER}" "3.5.1"

pg_prove --failures --Q --recurse \
--S client_min_messages=WARNING \
Expand Down