From 00570a21f50a4bda852d8aa77597d91fdae44b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Sun, 17 Mar 2019 18:01:41 +0100 Subject: [PATCH 1/4] Use devel branch of windshaft --- package-lock.json | 46 ++++++++++++++++++---------------------------- package.json | 2 +- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index e8e1115c..19ef869c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,12 +27,12 @@ } }, "@carto/tilelive-bridge": { - "version": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664", - "from": "github:cartodb/tilelive-bridge#2.5.1-cdb11", + "version": "github:cartodb/tilelive-bridge#126066832ace469d4b261bb8cb58c51e77e96518", + "from": "github:cartodb/tilelive-bridge#cartofy", "requires": { "@carto/mapnik": "3.6.2-carto.11", "@mapbox/sphericalmercator": "~1.0.1", - "mapnik-pool": "~0.1.3" + "generic-pool": "^3.6.1" }, "dependencies": { "@mapbox/sphericalmercator": { @@ -1941,9 +1941,9 @@ } }, "generic-pool": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.2.tgz", - "integrity": "sha1-eon0kdV1tC+fBpoOjixtuqPCQb4=" + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.6.1.tgz", + "integrity": "sha512-iMmD/pY4q0+V+f8o4twE9JPeqfNuX+gJAaIPB3B0W1lFkBOtTxBo6B0HxHPgGhzQA8jego7EWopcYq/UDJO2KA==" }, "get-caller-file": { "version": "1.0.3", @@ -2024,6 +2024,11 @@ } } }, + "generic-pool": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.2.tgz", + "integrity": "sha1-eon0kdV1tC+fBpoOjixtuqPCQb4=" + }, "mapnik-reference": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-8.5.6.tgz", @@ -2557,15 +2562,6 @@ "resolved": "https://registry.npmjs.org/lzma/-/lzma-2.3.2.tgz", "integrity": "sha1-N4OySFi5wOdHoN88vx+1/KqSxEE=" }, - "mapnik-pool": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/mapnik-pool/-/mapnik-pool-0.1.3.tgz", - "integrity": "sha1-m9rRyzTYehm8eOy0y/uqIDsvPys=", - "requires": { - "generic-pool": "~2.2.1", - "xtend": "~4.0.0" - } - }, "mapnik-reference": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-6.0.5.tgz", @@ -3934,19 +3930,14 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#a89d4147b3288804b679a018271893dda18373c2", - "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb18", + "version": "github:cartodb/tilelive-mapnik#194806841783c39e19681460c1965c09b72f6d44", + "from": "github:cartodb/tilelive-mapnik#cartofy", "requires": { "@carto/mapnik": "3.6.2-carto.11", - "generic-pool": "3.5.0", + "generic-pool": "^3.6.1", "mime": "2.3.1" }, "dependencies": { - "generic-pool": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.5.0.tgz", - "integrity": "sha512-dEkxmX+egB2o4NR80c/q+xzLLzLX+k68/K8xv81XprD+Sk7ZtP14VugeCz+fUwv5FzpWq40pPtAkzPRqT8ka9w==" - }, "mime": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", @@ -4156,12 +4147,11 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "4.13.3", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.13.3.tgz", - "integrity": "sha512-A5a9y1jA4ehtWgSPRUG1gBL/KF1mYytIk1r6OA85d1MsdgEGrcLaBgH1VISIoIGzKsEeriPanhRhagfn2/TL2g==", + "version": "github:cartodb/windshaft#301470f5bb2932be6b4cce12a78c70561298fde1", + "from": "github:cartodb/windshaft#cartofy", "requires": { "@carto/mapnik": "3.6.2-carto.11", - "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664", + "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#126066832ace469d4b261bb8cb58c51e77e96518", "abaculus": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8", "canvas": "github:cartodb/node-canvas#45bd3c7cc5e6f99ba75b0d417b6ac6384b43083d", "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", @@ -4175,7 +4165,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#a89d4147b3288804b679a018271893dda18373c2", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#194806841783c39e19681460c1965c09b72f6d44", "torque.js": "2.17.1", "underscore": "1.6.0" } diff --git a/package.json b/package.json index d1b62868..98234fad 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.0", "underscore": "1.6.0", - "windshaft": "^4.13.3", + "windshaft": "github:cartodb/windshaft#cartofy", "yargs": "11.1.0" }, "devDependencies": { From 290cdd2692e8402920ea177a6003dca036df0137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 18 Mar 2019 12:46:27 +0100 Subject: [PATCH 2/4] Update windshaft --- package-lock.json | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19ef869c..8fe4eb68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,19 +27,11 @@ } }, "@carto/tilelive-bridge": { - "version": "github:cartodb/tilelive-bridge#126066832ace469d4b261bb8cb58c51e77e96518", + "version": "github:cartodb/tilelive-bridge#5bdd15082ac3ad3f7c25d6247d896d0c8839eeb7", "from": "github:cartodb/tilelive-bridge#cartofy", "requires": { "@carto/mapnik": "3.6.2-carto.11", - "@mapbox/sphericalmercator": "~1.0.1", "generic-pool": "^3.6.1" - }, - "dependencies": { - "@mapbox/sphericalmercator": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz", - "integrity": "sha1-cCN7l3QJXtHP286nqP0fyCsmkfI=" - } } }, "abaculus": { @@ -4147,11 +4139,11 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#301470f5bb2932be6b4cce12a78c70561298fde1", + "version": "github:cartodb/windshaft#a29141842794f18a65abda1cb8d2ad3a9c5656c4", "from": "github:cartodb/windshaft#cartofy", "requires": { "@carto/mapnik": "3.6.2-carto.11", - "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#126066832ace469d4b261bb8cb58c51e77e96518", + "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#5bdd15082ac3ad3f7c25d6247d896d0c8839eeb7", "abaculus": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8", "canvas": "github:cartodb/node-canvas#45bd3c7cc5e6f99ba75b0d417b6ac6384b43083d", "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", From bf53a905a26667d6ebbb2914528c6ce63df03e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 19 Mar 2019 13:41:07 +0100 Subject: [PATCH 3/4] Upgrade windshaft to version 4.13.4 --- package-lock.json | 17 +++++++++-------- package.json | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fe4eb68..af0db023 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,8 +27,8 @@ } }, "@carto/tilelive-bridge": { - "version": "github:cartodb/tilelive-bridge#5bdd15082ac3ad3f7c25d6247d896d0c8839eeb7", - "from": "github:cartodb/tilelive-bridge#cartofy", + "version": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9", + "from": "github:cartodb/tilelive-bridge#2.5.1-cdb12", "requires": { "@carto/mapnik": "3.6.2-carto.11", "generic-pool": "^3.6.1" @@ -3922,8 +3922,8 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#194806841783c39e19681460c1965c09b72f6d44", - "from": "github:cartodb/tilelive-mapnik#cartofy", + "version": "github:cartodb/tilelive-mapnik#b5f37585a0a9d4e98bdbdcbbd083df24e64bfd7a", + "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb19", "requires": { "@carto/mapnik": "3.6.2-carto.11", "generic-pool": "^3.6.1", @@ -4139,11 +4139,12 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#a29141842794f18a65abda1cb8d2ad3a9c5656c4", - "from": "github:cartodb/windshaft#cartofy", + "version": "4.13.4", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.13.4.tgz", + "integrity": "sha512-9PI06KMC6SBaQX0FLlOmWk9HtKvPa6t09RdVwWJojEnDmmMtzzw1Rvw5gCp8h5DIcgs65fT6cU/gWAZRL+lOQQ==", "requires": { "@carto/mapnik": "3.6.2-carto.11", - "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#5bdd15082ac3ad3f7c25d6247d896d0c8839eeb7", + "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9", "abaculus": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8", "canvas": "github:cartodb/node-canvas#45bd3c7cc5e6f99ba75b0d417b6ac6384b43083d", "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", @@ -4157,7 +4158,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#194806841783c39e19681460c1965c09b72f6d44", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#b5f37585a0a9d4e98bdbdcbbd083df24e64bfd7a", "torque.js": "2.17.1", "underscore": "1.6.0" } diff --git a/package.json b/package.json index 98234fad..eb3eb717 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.0", "underscore": "1.6.0", - "windshaft": "github:cartodb/windshaft#cartofy", + "windshaft": "4.13.4", "yargs": "11.1.0" }, "devDependencies": { From 6d360a8b03a68e4db4edcc1c4e5f25887f25b896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 19 Mar 2019 15:45:20 +0100 Subject: [PATCH 4/4] Update NEWs --- NEWS.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index ea605fbe..fe902920 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,7 +8,10 @@ Announcements: - Numeric histogram performance improvement (#1080) - Fix boolean aggregation layer option not working when numbers of rows are above the threshold (#1082) - Update deps: - - windshaft@4.13.3: Upgrade grainstore to version 1.11.0, do not hang when child process is not able to generate a Mapnik XML + - windshaft@4.13.4: + - Upgrade `tilelive-mapnik` to version `0.6.18-cdb19` + - Upgrade `@carto/tilelive-bridge` to version `2.5.1-cdb12` + - Upgrade `grainstore` to version `1.11.0`, do not hang when child process is not able to generate a Mapnik XML ## 7.0.0 Released 2019-02-22