Rafa de la Torre
|
76ee4cacbc
|
Revert changes in release/ dir
|
2016-06-29 18:49:14 +02:00 |
|
Rafa de la Torre
|
4192930260
|
Merge remote-tracking branch 'origin/develop'
|
2016-06-29 18:47:23 +02:00 |
|
Rafa de la Torre
|
2fe50e1f71
|
Merge pull request #70 from CartoDB/segmentation
Segmentation pull request
|
2016-06-29 18:35:01 +02:00 |
|
Rafa de la Torre
|
d97231f604
|
Revert changes in release/ dir
|
2016-06-29 18:34:01 +02:00 |
|
Rafa de la Torre
|
cb330ebe6b
|
Make test more robust
|
2016-06-29 18:12:21 +02:00 |
|
Rafa de la Torre
|
505ae0fb44
|
Go back to using numpy==1.6.1
|
2016-06-29 17:09:36 +02:00 |
|
Rafa de la Torre
|
35b5612ded
|
Merge remote-tracking branch 'origin/develop' into segmentation
Conflicts:
src/py/crankshaft/crankshaft/__init__.py
|
2016-06-29 17:09:14 +02:00 |
|
Stuart Lynn
|
cfb58f7898
|
removing full function calls to be compatiable with numpy 1.6.1
|
2016-06-29 14:46:03 +00:00 |
|
Rafa de la Torre
|
bef5fe2c80
|
Merge remote-tracking branch 'origin/develop'
|
2016-06-29 16:35:34 +02:00 |
|
Rafa de la Torre
|
ab349fbdc0
|
Merge pull request #78 from CartoDB/77-fix-markov-tests
Fix Markov trend_test that expects a bool #77
|
2016-06-29 16:34:21 +02:00 |
|
Andy Eschbacher
|
9e4d378a08
|
updates error bounds
|
2016-06-29 10:27:19 -04:00 |
|
Rafa de la Torre
|
3a2e5ec7f9
|
Fix Markov trend_test that expects a bool #77
|
2016-06-29 16:06:38 +02:00 |
|
Rafa de la Torre
|
1e42c23919
|
Merge pull request #76 from CartoDB/develop
Release prep: merge develop into master
|
2016-06-29 15:50:18 +02:00 |
|
Rafa de la Torre
|
55d2860a84
|
Merge tag '0.0.4'
0.0.4 (2016-06-20)
------------------
* Remove cartodb extension dependency from tests
* Declare all correct dependencies with correct versions in setup.py
Conflicts:
CONTRIBUTING.md
src/pg/Makefile
|
2016-06-29 15:22:02 +02:00 |
|
Andy Eschbacher
|
b7860d5a24
|
Merge pull request #23 from CartoDB/add-spatial-markov
[wip] Add spatial markov
|
2016-06-28 17:41:23 -04:00 |
|
Andy Eschbacher
|
476ec04386
|
fill in rest of docs descriptions
|
2016-06-28 14:44:17 -04:00 |
|
Andy Eschbacher
|
75d97915d6
|
update tests from production machine
|
2016-06-28 14:23:36 -04:00 |
|
Stuart Lynn
|
068c80f369
|
fixing errors in documentatio
|
2016-06-28 18:03:52 +00:00 |
|
Stuart Lynn
|
5f98735ce9
|
adding documentation for pyagg helper
|
2016-06-28 16:04:23 +00:00 |
|
Stuart Lynn
|
7d6148456e
|
adding inline documentation
|
2016-06-28 16:02:06 +00:00 |
|
Stuart Lynn
|
f6f9d6e9c8
|
resolves testing issues
|
2016-06-28 15:49:34 +00:00 |
|
Andy Eschbacher
|
32515f445e
|
update tests and paths
|
2016-06-28 10:48:10 -04:00 |
|
Andy Eschbacher
|
dd0ca9a24f
|
Merge branch 'develop' into add-spatial-markov
|
2016-06-28 10:19:36 -04:00 |
|
Andy Eschbacher
|
045fd67f47
|
formatting
|
2016-06-28 10:15:31 -04:00 |
|
Andy Eschbacher
|
2bb2e60af8
|
catching errors
|
2016-06-28 10:06:54 -04:00 |
|
Andy Eschbacher
|
99dc363c7d
|
format query
|
2016-06-27 10:12:06 -04:00 |
|
Andy Eschbacher
|
c799f4d73b
|
fix formatting of query
|
2016-06-27 10:09:13 -04:00 |
|
Andy Eschbacher
|
3e01470aa0
|
add error catching
|
2016-06-27 10:07:22 -04:00 |
|
Andy Eschbacher
|
a2b3733a1e
|
fix improper line drop
|
2016-06-27 09:58:42 -04:00 |
|
Andy Eschbacher
|
a5e4ae99ce
|
update tests
|
2016-06-27 09:57:23 -04:00 |
|
Andy Eschbacher
|
c80975fe46
|
updating formatting
|
2016-06-27 09:56:58 -04:00 |
|
Andy Eschbacher
|
dae406927f
|
formatting updates
|
2016-06-27 09:56:12 -04:00 |
|
Andy Eschbacher
|
a177bf5620
|
minor doc updates
|
2016-06-27 08:54:28 -04:00 |
|
Andy Eschbacher
|
de7d56dc29
|
doc edits
|
2016-06-24 17:00:08 -04:00 |
|
Stuart Lynn
|
642935e44a
|
pyAgg documentation
|
2016-06-23 21:33:17 +00:00 |
|
Stuart Lynn
|
15fc0bb683
|
segmentation documentation
|
2016-06-23 21:17:51 +00:00 |
|
Stuart Lynn
|
8cbc29a3e6
|
adding helper method to be abel to pass 2D arrays from postgresql to python
|
2016-06-23 20:23:39 +00:00 |
|
Stuart Lynn
|
03aada8758
|
Adding a segmentation version that doesn't use query string passing
|
2016-06-23 20:23:04 +00:00 |
|
Rafa de la Torre
|
faa899cf87
|
Fix installation for development mode
|
2016-06-23 10:11:59 +02:00 |
|
Stuart Lynn
|
911a0ccccc
|
Merge branch 'develop' into segmentation
|
2016-06-22 21:46:07 +00:00 |
|
Stuart Lynn
|
76b3a873b8
|
segmentation pg tests
|
2016-06-22 21:43:32 +00:00 |
|
Stuart Lynn
|
de274bf628
|
removing commented code
|
2016-06-22 21:43:03 +00:00 |
|
Andy Eschbacher
|
95803b4cd4
|
Merge pull request #66 from CartoDB/fix-moran-query-ordering-problem
fix ordering problem in moran query construction
|
2016-06-22 17:16:44 -04:00 |
|
Andy Eschbacher
|
609e2aa015
|
Merge branch 'develop' into fix-moran-query-ordering-problem
|
2016-06-22 17:15:47 -04:00 |
|
Andy Eschbacher
|
44a6471c69
|
Merge pull request #69 from CartoDB/spatial_interpolation_test_edits
Spatial interpolation test edits
|
2016-06-22 17:15:31 -04:00 |
|
Andy Eschbacher
|
2fa087bb62
|
adding row info :/
|
2016-06-22 17:11:51 -04:00 |
|
Andy Eschbacher
|
3f210c2a71
|
reducing amt of text in outputs
|
2016-06-22 17:08:50 -04:00 |
|
Andy Eschbacher
|
6a9045ba62
|
updating test outputs
|
2016-06-22 16:56:35 -04:00 |
|
Andy Eschbacher
|
6f72075999
|
altering test outputs for less formatting
|
2016-06-22 16:50:10 -04:00 |
|
Stuart Lynn
|
89c47dcef6
|
mocking out cursor
|
2016-06-22 20:21:52 +00:00 |
|