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

Create v3.4.0 without conflicts #2395

Merged
merged 579 commits into from
Oct 6, 2022
Merged

Create v3.4.0 without conflicts #2395

merged 579 commits into from
Oct 6, 2022

Conversation

cvvergara
Copy link
Member

Fixes #2393

git checkout upstream/develop
git switch -c develop-3.4.0
git merge -s ours upstream/main

@pgRouting/admins

cvvergara and others added 30 commits June 24, 2022 13:12
Currently translated at 100.0% (76 of 76 strings)

Translation: pgRouting/pgr_TSPeuclidean
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_tspeuclidean/es/
Currently translated at 100.0% (56 of 56 strings)

Translation: pgRouting/pgr_isPlanar
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_isplanar/es/
Currently translated at 100.0% (26 of 26 strings)

Translation: pgRouting/cost-category
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/cost-category/es/
Currently translated at 100.0% (26 of 26 strings)

Translation: pgRouting/cost-category
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/cost-category/es/
Currently translated at 100.0% (68 of 68 strings)

Translation: pgRouting/pgr_breadthFirstSearch
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_breadthfirstsearch/es/
Currently translated at 100.0% (68 of 68 strings)

Translation: pgRouting/pgr_breadthFirstSearch
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_breadthfirstsearch/es/
Currently translated at 100.0% (61 of 61 strings)

Translation: pgRouting/pgr_primDD
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_primdd/es/
Currently translated at 100.0% (61 of 61 strings)

Translation: pgRouting/pgr_primDD
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_primdd/es/
Currently translated at 100.0% (90 of 90 strings)

Translation: pgRouting/pgr_dijkstraNear
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_dijkstranear/es/
Currently translated at 100.0% (78 of 78 strings)

Translation: pgRouting/pgr_withPointsCost
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_withpointscost/es/
Currently translated at 100.0% (56 of 56 strings)

Translation: pgRouting/pgr_lineGraph
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_linegraph/es/
Currently translated at 100.0% (22 of 22 strings)

Translation: pgRouting/drivingDistance-category
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/drivingdistance-category/es/
Currently translated at 100.0% (22 of 22 strings)

Translation: pgRouting/drivingDistance-category
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/drivingdistance-category/es/
Currently translated at 100.0% (57 of 57 strings)

Translation: pgRouting/pgr_sequentialVertexColoring
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_sequentialvertexcoloring/es/
Currently translated at 100.0% (57 of 57 strings)

Translation: pgRouting/pgr_sequentialVertexColoring
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_sequentialvertexcoloring/es/
Currently translated at 100.0% (73 of 73 strings)

Translation: pgRouting/pgr_analyzeGraph
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_analyzegraph/es/
Currently translated at 100.0% (64 of 64 strings)

Translation: pgRouting/pgr_boykovKolmogorov
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_boykovkolmogorov/es/
Currently translated at 100.0% (58 of 58 strings)

Translation: pgRouting/pgr_bipartite
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_bipartite/es/
Currently translated at 100.0% (58 of 58 strings)

Translation: pgRouting/pgr_bipartite
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_bipartite/es/
Currently translated at 100.0% (40 of 40 strings)

Translation: pgRouting/pgr_bridges
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_bridges/es/
Currently translated at 100.0% (79 of 79 strings)

Translation: pgRouting/pgr_bellmanFord
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_bellmanford/es/
Currently translated at 100.0% (98 of 98 strings)

Translation: pgRouting/pgr_pickDeliver
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_pickdeliver/es/
Currently translated at 100.0% (98 of 98 strings)

Translation: pgRouting/pgr_pickDeliver
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_pickdeliver/es/
Currently translated at 100.0% (67 of 67 strings)

Translation: pgRouting/pgr_withPoints
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_withpoints/es/
Currently translated at 100.0% (53 of 53 strings)

Translation: pgRouting/pgr_maxCardinalityMatch
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_maxcardinalitymatch/es/
Currently translated at 100.0% (53 of 53 strings)

Translation: pgRouting/pgr_maxCardinalityMatch
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_maxcardinalitymatch/es/
Currently translated at 100.0% (62 of 62 strings)

Translation: pgRouting/pgr_extractVertices
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_extractvertices/es/
Currently translated at 100.0% (63 of 63 strings)

Translation: pgRouting/pgr_primBFS
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_primbfs/es/
Currently translated at 100.0% (63 of 63 strings)

Translation: pgRouting/pgr_primBFS
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgr_primbfs/es/
Currently translated at 100.0% (19 of 19 strings)

Translation: pgRouting/topology-functions
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/topology-functions/es/
weblate and others added 20 commits September 29, 2022 21:00
Currently translated at 100.0% (109 of 109 strings)

Translation: pgRouting/index
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/index/es/
Currently translated at 79.5% (4095 of 5147 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Currently translated at 100.0% (109 of 109 strings)

Translation: pgRouting/index
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/index/es/
Currently translated at 100.0% (109 of 109 strings)

Translation: pgRouting/index
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/index/es/
Currently translated at 81.6% (4201 of 5147 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Currently translated at 81.6% (4201 of 5147 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Currently translated at 100.0% (112 of 112 strings)

Translation: pgRouting/index
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/index/es/
Currently translated at 81.6% (4205 of 5147 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Currently translated at 2.9% (154 of 5147 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ja/
Currently translated at 81.6% (4205 of 5147 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Currently translated at 83.2% (4285 of 5147 strings)

Co-authored-by: Celia Virginia Vergara Castillo <[email protected]>
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Translation: pgRouting/pgRouting
Currently translated at 84.3% (4342 of 5147 strings)

Co-authored-by: Pedro Jose Rios Vergara <[email protected]>
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Translation: pgRouting/pgRouting
Currently translated at 84.3% (4342 of 5147 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Currently translated at 84.3% (4342 of 5147 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Currently translated at 84.3% (4342 of 5147 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Bumps [MarkusJx/install-boost](https://github.com/MarkusJx/install-boost) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/MarkusJx/install-boost/releases)
- [Commits](MarkusJx/install-boost@v2.3.0...v2.4.0)

---
updated-dependencies:
- dependency-name: MarkusJx/install-boost
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
on the position (11) which may not work with other postgres variants
because of the different strings they may carry like EnterpriseDB for
an example.

So instead of of using string substring to parse the version, use
string regex match. Also, move up the code to replace the strings
alpha/beta/rc a bit to support the patch

Tested on Linux
@cvvergara cvvergara added this to the Release 3.4.0 milestone Oct 6, 2022
@cvvergara cvvergara mentioned this pull request Oct 6, 2022
Copy link
Member

@krashish8 krashish8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks!

@krashish8 krashish8 merged commit c7a26f9 into main Oct 6, 2022
@cvvergara cvvergara deleted the develop-3.4.0 branch October 6, 2022 16:08
@cvvergara cvvergara restored the develop-3.4.0 branch October 6, 2022 16:09
@cvvergara cvvergara deleted the develop-3.4.0 branch October 6, 2022 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants