From 87c3fa8fc54364e3d24861e2001d370bef55d705 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Tue, 14 Aug 2018 15:23:06 +0200 Subject: [PATCH 1/3] Add carto-package.json In this case in the `requires` section I considered the minimum versions the ones used by travis CI scripts. --- carto-package.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 carto-package.json diff --git a/carto-package.json b/carto-package.json new file mode 100644 index 0000000..9bf9ad9 --- /dev/null +++ b/carto-package.json @@ -0,0 +1,16 @@ +{ + "name": "crankshaft", + "current_version": { + "requires": { + "postgres": ">=9.5", + "postgis": ">=2.2" + }, + "works_with": { + "_comment": "Crankshaft used from Windshaft-cartodb from camshaft@0.23.0", + "windshaft": ">=2.54.0" + } + }, + + "exceptional_versions": { + } +} From 19397eec5b2fa47917c3d6a04c2dbac31b3f4426 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Tue, 14 Aug 2018 17:02:16 +0200 Subject: [PATCH 2/3] Remove the works_with --- carto-package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/carto-package.json b/carto-package.json index 9bf9ad9..9afa58e 100644 --- a/carto-package.json +++ b/carto-package.json @@ -6,8 +6,6 @@ "postgis": ">=2.2" }, "works_with": { - "_comment": "Crankshaft used from Windshaft-cartodb from camshaft@0.23.0", - "windshaft": ">=2.54.0" } }, From 7c43596512764ce641bd902ca7f26b40464b2cc4 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Tue, 14 Aug 2018 17:07:08 +0200 Subject: [PATCH 3/3] Add the python dependencies As specified in the requirements.txt and setup.py. They are needed by plpy procedural language, which uses the python system installation and python modules that must be installed at system level with their c/c++ bindings. We have some experience with those: getting a working installation is easy, but getting it right is not obvious at all. These are the tested and packages versions, so for the moment I'm pinning to those. --- carto-package.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/carto-package.json b/carto-package.json index 9afa58e..234b81a 100644 --- a/carto-package.json +++ b/carto-package.json @@ -3,7 +3,13 @@ "current_version": { "requires": { "postgres": ">=9.5", - "postgis": ">=2.2" + "postgis": ">=2.2", + "python": ">=2.7", + "joblib": "0.8.3", + "numpy": "1.6.1", + "scipy": "0.14.0", + "pysal": "1.14.3", + "scikit-learn": "0.14.1" }, "works_with": { }