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

Creating new minor 3.7.0 #2597

Merged
merged 12 commits into from
Jan 3, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/boost_version.yml
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.6.0"
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"
27 changes: 27 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,31 @@ name: Build for macOS

on:
workflow_dispatch:
push:
paths:
- '.github/workflows/macos.yml'
- 'src/**'
- 'include/**'
- 'pgtap/**'
- 'tools/testers/**'
- './CMakeLists.txt'

branches-ignore:
- 'gh-pages'

tags: []

pull_request:
paths:
- '.github/workflows/macos.yml'
- 'src/**'
- 'include/**'
- 'pgtap/**'
- 'tools/testers/**'
- './CMakeLists.txt'

branches-ignore:
- 'gh-pages'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -39,6 +64,7 @@ jobs:
sudo make install

- name: Install pgTAP
if: false
run: |
git clone https://github.com/theory/pgtap.git pgTapExtension
cd pgTapExtension
Expand All @@ -49,6 +75,7 @@ jobs:
sudo ln -s /usr/local/Cellar/perl/5.32.1_1/bin/pg_prove symlink it into /usr/local/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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
psql: [11,12,13,14,15]
psql: [11,12,13,14,15,16]
postgis: [3]
os: [ubuntu-latest, ubuntu-20.04]

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update.yml
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.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]
old_pgr: [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
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.6.0';"
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"
8 changes: 5 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ include(pgr/BuildType)
#---------------------------------------------
#---------------------------------------------

project(PGROUTING VERSION 3.6.0
project(PGROUTING VERSION 3.7.0
LANGUAGES C CXX )
set(PROJECT_VERSION_DEV "")
set(PROJECT_VERSION_DEV "-dev")
string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)

include(pgr/GitInfo)
Expand All @@ -31,8 +31,10 @@ 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.1
3.6.0
3.5.1
3.5.0
3.4.2
Expand Down
15 changes: 15 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
pgRouting 3.7.0 Release Notes
-------------------------------------------------------------------------------

No Changes Yet

pgRouting 3.6.1 Release Notes
-------------------------------------------------------------------------------

To see all issues & pull requests closed by this release see the `Git closed
milestone for 3.6.1
<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.1%22>`_

* [#2588](https://github.com/pgRouting/pgrouting/pull/2588) pgrouting 3.6.0
fails to build on OSX

pgRouting 3.6.0 Release Notes
-------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion doc/_static/page_history.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']},
Expand Down
17 changes: 17 additions & 0 deletions doc/src/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,23 @@ To see the full list of changes check the list of `Git commits
.. contents:: Contents
:local:



pgRouting 3.7.0 Release Notes
-------------------------------------------------------------------------------

No Changes Yet

pgRouting 3.6.1 Release Notes
-------------------------------------------------------------------------------

To see all issues & pull requests closed by this release see the `Git closed
milestone for 3.6.1
<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.1%22>`_

* `#2588 <https://github.com/pgRouting/pgrouting/pull/2588>`__ pgrouting 3.6.0
fails to build on OSX

pgRouting 3.6.0 Release Notes
-------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion docqueries/version/doc-full_version.result
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.6.0-dev | pgrouting-3.6.0
3.7.0-dev | pgrouting-3.7.0
(1 row)

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

/* -- q2 */
Expand Down
2 changes: 1 addition & 1 deletion include/c_types/restriction_t.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
struct Restriction_t {
double cost;
int64_t * via;
uint64_t via_size;
size_t via_size;
};

#endif // INCLUDE_C_TYPES_RESTRICTION_T_H_
2 changes: 1 addition & 1 deletion include/cpp_common/get_check_data.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ char getChar(const HeapTuple, const TupleDesc&, const Column_info_t&, bool, char
int64_t* get_array(ArrayType*, size_t*, bool);

/** @brief Function returns the values of specified columns in array. */
int64_t* getBigIntArr(const HeapTuple, const TupleDesc&, const Column_info_t&, uint64_t*);
int64_t* getBigIntArr(const HeapTuple, const TupleDesc&, const Column_info_t&, size_t*);

/** @brief Function returns the value of specified column in integer type. */
int64_t getBigInt(const HeapTuple, const TupleDesc&, const Column_info_t&);
Expand Down
2 changes: 1 addition & 1 deletion locale/de/LC_MESSAGES/index.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# 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/de/LC_MESSAGES/pgrouting_doc_strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# This file is distributed under the same license as the pgRouting package.
# Regina Obe <regina@arrival3d.com>, 2023.
msgid ""
Expand Down
2 changes: 1 addition & 1 deletion locale/en/LC_MESSAGES/index.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
#
Expand Down
29 changes: 25 additions & 4 deletions locale/en/LC_MESSAGES/pgrouting_doc_strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
#
Expand All @@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: pgRouting v3.6.0-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-10-19 19:56+0000\n"
"POT-Creation-Date: 2023-12-30 16:20-0600\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.13.0\n"
"Generated-By: Babel 2.12.1\n"

msgid "BFS - Category"
msgstr ""
Expand Down Expand Up @@ -6840,7 +6840,7 @@ msgid "Upgrading the database"
msgstr ""

msgid ""
"To upgrade pgRouting in the database to version 3.6.0 use the following "
"To upgrade pgRouting in the database to version 3.7.0 use the following "
"command:"
msgstr ""

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

msgid "pgRouting 3.7.0 Release Notes"
msgstr ""

msgid "No Changes Yet"
msgstr ""

msgid "pgRouting 3.6.1 Release Notes"
msgstr ""

#, python-format
msgid ""
"To see all issues & pull requests closed by this release see the `Git "
"closed milestone for 3.6.1 "
"<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.1%22>`_"
msgstr ""

msgid ""
"`#2588 <https://github.com/pgRouting/pgrouting/pull/2588>`__ pgrouting "
"3.6.0 fails to build on OSX"
msgstr ""

msgid "pgRouting 3.6.0 Release Notes"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion locale/es/LC_MESSAGES/index.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# 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
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.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
# Translators:
Expand Down
2 changes: 1 addition & 1 deletion locale/ko/LC_MESSAGES/index.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# This file is distributed under the same license as the pgRouting package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
Expand Down
23 changes: 19 additions & 4 deletions locale/pot/pgrouting_doc_strings.pot
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# 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.6.0-dev\n"
"Project-Id-Version: pgRouting v3.7.0-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-10-19 19:56+0000\n"
"POT-Creation-Date: 2023-12-30 16:20-0600\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 @@ -6013,7 +6013,7 @@ msgstr ""
msgid "Upgrading the database"
msgstr ""

msgid "To upgrade pgRouting in the database to version 3.6.0 use the following command:"
msgid "To upgrade pgRouting in the database to version 3.7.0 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 @@ -12907,6 +12907,21 @@ 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.7.0 Release Notes"
msgstr ""

msgid "No Changes Yet"
msgstr ""

msgid "pgRouting 3.6.1 Release Notes"
msgstr ""

msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.6.1 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.1%22>`_"
msgstr ""

msgid "`#2588 <https://github.com/pgRouting/pgrouting/pull/2588>`__ pgrouting 3.6.0 fails to build on OSX"
msgstr ""

msgid "pgRouting 3.6.0 Release Notes"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion locale/zh_Hans/LC_MESSAGES/index.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# 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/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) pgRouting Contributors - Version v3.6.0-dev
# Copyright (C) pgRouting Contributors - Version v3.7.0-dev
# This file is distributed under the same license as the pgRouting package.
# Regina Obe <regina@arrival3d.com>, 2023.
# Wangdapeng <wangdapeng20191008@gmail.com>, 2023.
Expand Down
Loading