From 837f99f31c4bcd058c87b1978810bc19b97b4e49 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Tue, 3 Nov 2015 16:55:42 +0100 Subject: [PATCH 1/5] Restrict npm supported versions to >=1.2.1 <2.0.0 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9a953c02..18e216b3 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Requirements ------------ - Core - Node.js >=0.8 - - npm >=1.2.1 + - npm >=1.2.1 <2.0.0 - PostgreSQL >8.3.x, PostGIS >1.5.x - Redis >2.4.0 (http://www.redis.io) - Mapnik 2.0.1, 2.0.2, 2.1.0, 2.2.0, 2.3.0. See Installing Mapnik. @@ -92,7 +92,7 @@ Examples -------- [CartoDB's Map Gallery](http://cartodb.com/gallery/) showcases several examples of visualisations built on top of this. - +m Contributing --- From 2320b0b852c01029ee5474cb4542f04ea930872e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Tue, 3 Nov 2015 16:56:37 +0100 Subject: [PATCH 2/5] Reference Windshaft's notes on Installing Mapnik --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18e216b3..27cf167e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Requirements - npm >=1.2.1 <2.0.0 - PostgreSQL >8.3.x, PostGIS >1.5.x - Redis >2.4.0 (http://www.redis.io) - - Mapnik 2.0.1, 2.0.2, 2.1.0, 2.2.0, 2.3.0. See Installing Mapnik. + - Mapnik 2.0.1, 2.0.2, 2.1.0, 2.2.0, 2.3.0. See [Installing Mapnik](https://github.com/CartoDB/Windshaft#installing-mapnik). - Windshaft: check [Windshaft dependencies and installation notes](https://github.com/CartoDB/Windshaft#dependencies) - libcairo2-dev, libpango1.0-dev, libjpeg8-dev and libgif-dev for server side canvas support From 3dbcf5f2939af2909f25c3102b360c43b88e5478 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 11 Nov 2015 16:28:21 +0100 Subject: [PATCH 3/5] Upgrade windshaft/mapnik --- NEWS.md | 4 +-- npm-shrinkwrap.json | 62 ++++++++++++++++++++++----------------------- package.json | 4 +-- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NEWS.md b/NEWS.md index 80f7dbcf..acb0e821 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,9 @@ # Changelog -## 2.18.1 +## 2.19.0 Released 2015-mm-dd - + - Upgrades windshaft to [1.6.0](https://github.com/CartoDB/Windshaft/releases/tag/1.6.0) ## 2.18.0 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3eebe64e..cf2f2f0b 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.18.1", + "version": "2.19.0", "dependencies": { "body-parser": { "version": "1.14.1", @@ -321,9 +321,9 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz" }, "range-parser": { - "version": "1.0.2", + "version": "1.0.3", "from": "range-parser@~1.0.2", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz" + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz" }, "send": { "version": "0.13.0", @@ -522,9 +522,9 @@ "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz", "dependencies": { "readable-stream": { - "version": "2.0.3", + "version": "2.0.4", "from": "readable-stream@~2.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", @@ -533,7 +533,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@~2.0.1", + "from": "inherits@2", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "isarray": { @@ -652,9 +652,9 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz" }, "hawk": { - "version": "3.1.0", + "version": "3.1.1", "from": "hawk@~3.1.0", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.1.tgz", "dependencies": { "hoek": { "version": "2.16.3", @@ -662,9 +662,9 @@ "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" }, "boom": { - "version": "2.10.0", + "version": "2.10.1", "from": "boom@^2.8.x", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz" + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" }, "cryptiles": { "version": "2.0.5", @@ -774,9 +774,9 @@ } }, "is-my-json-valid": { - "version": "2.12.2", + "version": "2.12.3", "from": "is-my-json-valid@^2.12.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.2.tgz", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz", "dependencies": { "generate-function": { "version": "2.0.0", @@ -801,9 +801,9 @@ "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz" }, "xtend": { - "version": "4.0.0", + "version": "4.0.1", "from": "xtend@^4.0.0", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz" + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" } } } @@ -827,13 +827,13 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.5.0", - "from": "windshaft@~1.5.0", + "version": "1.6.0", + "from": "windshaft@~1.6.0", "dependencies": { "mapnik": { - "version": "1.4.15-cdb5", - "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5", - "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5", + "version": "1.4.15-cdb6", + "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb6", + "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb6", "dependencies": { "nan": { "version": "1.2.0", @@ -2999,9 +2999,9 @@ } }, "tilelive-mapnik": { - "version": "0.6.15-cdb3", - "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3", - "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3", + "version": "0.6.15-cdb4", + "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb4", + "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb4", "dependencies": { "generic-pool": { "version": "2.1.1", @@ -3016,14 +3016,14 @@ } }, "tilelive-bridge": { - "version": "1.3.0-cdb3", - "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3", - "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3", + "version": "1.3.0-cdb4", + "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb4", + "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb4", "dependencies": { "mapnik-pool": { - "version": "0.1.1-cdb3", - "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3", - "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3", + "version": "0.1.1-cdb4", + "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb4", + "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb4", "dependencies": { "generic-pool": { "version": "2.1.1", @@ -3109,9 +3109,9 @@ "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz" }, "abaculus": { - "version": "1.1.0-cdb3", - "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3", - "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3" + "version": "1.1.0-cdb4", + "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb4", + "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb4" }, "sphericalmercator": { "version": "1.0.3", diff --git a/package.json b/package.json index 592b9127..7984ee72 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.18.1", + "version": "2.19.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -29,7 +29,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "~1.5.0", + "windshaft": "~1.6.0", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From 6d55544d709b14881738a340273eba476a63f750 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 12 Nov 2015 11:29:50 +0100 Subject: [PATCH 4/5] Release 2.19.0 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index acb0e821..3af3d31c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ## 2.19.0 -Released 2015-mm-dd +Released 2015-11-12 - Upgrades windshaft to [1.6.0](https://github.com/CartoDB/Windshaft/releases/tag/1.6.0) ## 2.18.0 From 9e00cb3309fb9d21117f8cecd0d27872fb042792 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 12 Nov 2015 11:30:58 +0100 Subject: [PATCH 5/5] Stubs next version --- NEWS.md | 3 +++ npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 3af3d31c..1be89175 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,8 @@ # Changelog +## 2.19.1 + + ## 2.19.0 Released 2015-11-12 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index cf2f2f0b..ce85f199 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.19.0", + "version": "2.19.1", "dependencies": { "body-parser": { "version": "1.14.1", diff --git a/package.json b/package.json index 7984ee72..63aed124 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.19.0", + "version": "2.19.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb"