From a32e90ea8ad93ea7c0fd3b761c985668f5571be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Ignacio=20S=C3=A1nchez=20Lara?= Date: Thu, 2 Aug 2018 12:59:45 +0200 Subject: [PATCH 1/2] carto-package.json proposal --- client/carto-package.json | 17 +++++++++++ server/extension/carto-package.json | 30 +++++++++++++++++++ .../cartodb_services/carto-package.json | 11 +++++++ 3 files changed, 58 insertions(+) create mode 100644 client/carto-package.json create mode 100644 server/extension/carto-package.json create mode 100644 server/lib/python/cartodb_services/carto-package.json diff --git a/client/carto-package.json b/client/carto-package.json new file mode 100644 index 0000000..8e9608d --- /dev/null +++ b/client/carto-package.json @@ -0,0 +1,17 @@ +{ + "name": "dataservices-api-client-extension", + "versions": { + "0.25.0": { + "tag": "0.25.0-client", + "works_with": { + "dataservices-api-server-extension": "^0.32.0" + }, + "requires": { + "postgresql": "^10.0.0", + "postgis": "^2.4", + "cartodb-postgresql": "^0.23.0" + } + } + } +} + diff --git a/server/extension/carto-package.json b/server/extension/carto-package.json new file mode 100644 index 0000000..fd0d32a --- /dev/null +++ b/server/extension/carto-package.json @@ -0,0 +1,30 @@ +{ + "name": "dataservices-api-server-extension", + "versions": { + "0.32.0": { + "tag": "0.32.0-server", + "works_with": { + "dataservices-api-server-python-lib": "^0.19.0" + }, + "requires": { + "postgresql": "^10.0.0", + "postgis": "^2.4", + "cartodb-postgresql": "^0.23.0" + } + }, + "0.32.0-customer": { + "tag": "0.32.0-server-customer", + "works_with": { + "dataservices-api-server-python-lib": { + "git-repository": "https://github.com/CUSTOMER/dataservices-api", + "manifest": "/server/extension/carto-package.json", + "version": "0.19.0-experimental" + } + }, + "requires": { + "postgresql": "^10.0.0", + "postgis": "^2.4", + "cartodb-postgresql": "^0.23.0" + } + } +} diff --git a/server/lib/python/cartodb_services/carto-package.json b/server/lib/python/cartodb_services/carto-package.json new file mode 100644 index 0000000..9b9e655 --- /dev/null +++ b/server/lib/python/cartodb_services/carto-package.json @@ -0,0 +1,11 @@ +{ + "name": "dataservices-api-server-python-lib", + "versions": { + "0.19.0": { + "tag": "python-0.19.0", + "requires": { + "python": "2.7" + } + } + } +} From c1c671755c48e7a5823d8e6ee47a4c6cc4ac5d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Ignacio=20S=C3=A1nchez=20Lara?= Date: Mon, 13 Aug 2018 16:20:59 +0200 Subject: [PATCH 2/2] Final carto-package.json format --- client/carto-package.json | 20 +++++------- server/extension/carto-package.json | 32 +++++-------------- .../cartodb_services/carto-package.json | 9 ++---- 3 files changed, 19 insertions(+), 42 deletions(-) diff --git a/client/carto-package.json b/client/carto-package.json index 8e9608d..1ec7a40 100644 --- a/client/carto-package.json +++ b/client/carto-package.json @@ -1,17 +1,13 @@ { "name": "dataservices-api-client-extension", - "versions": { - "0.25.0": { - "tag": "0.25.0-client", - "works_with": { - "dataservices-api-server-extension": "^0.32.0" - }, - "requires": { - "postgresql": "^10.0.0", - "postgis": "^2.4", - "cartodb-postgresql": "^0.23.0" - } + "current_version": { + "requires": { + "postgresql": "^10.0.0", + "postgis": "^2.4", + "cartodb-extension": "^0.23.0" + }, + "works_with": { + "dataservices-api-server-extension": "^0.32.0" } } } - diff --git a/server/extension/carto-package.json b/server/extension/carto-package.json index fd0d32a..29514f7 100644 --- a/server/extension/carto-package.json +++ b/server/extension/carto-package.json @@ -1,30 +1,14 @@ { "name": "dataservices-api-server-extension", - "versions": { - "0.32.0": { - "tag": "0.32.0-server", - "works_with": { - "dataservices-api-server-python-lib": "^0.19.0" - }, - "requires": { - "postgresql": "^10.0.0", - "postgis": "^2.4", - "cartodb-postgresql": "^0.23.0" - } + "current_version": { + "requires": { + "postgresql": "^10.0.0", + "postgis": "^2.4", + "cartodb-postgresql": "^0.23.0" }, - "0.32.0-customer": { - "tag": "0.32.0-server-customer", - "works_with": { - "dataservices-api-server-python-lib": { - "git-repository": "https://github.com/CUSTOMER/dataservices-api", - "manifest": "/server/extension/carto-package.json", - "version": "0.19.0-experimental" - } - }, - "requires": { - "postgresql": "^10.0.0", - "postgis": "^2.4", - "cartodb-postgresql": "^0.23.0" + "works_with": { + "dataservices-api-server-python-lib": "^0.19.1", + "observatory-server-extension": "^1.9.0" } } } diff --git a/server/lib/python/cartodb_services/carto-package.json b/server/lib/python/cartodb_services/carto-package.json index 9b9e655..47a1277 100644 --- a/server/lib/python/cartodb_services/carto-package.json +++ b/server/lib/python/cartodb_services/carto-package.json @@ -1,11 +1,8 @@ { "name": "dataservices-api-server-python-lib", - "versions": { - "0.19.0": { - "tag": "python-0.19.0", - "requires": { - "python": "2.7" - } + "current_version": { + "requires": { + "python": "2.7" } } }