Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update from zilliztech/master #42

Merged
merged 25 commits into from
Apr 9, 2020
Merged

update from zilliztech/master #42

merged 25 commits into from
Apr 9, 2020

Conversation

xige-16
Copy link
Owner

@xige-16 xige-16 commented Apr 9, 2020

No description provided.

yefu.chen and others added 25 commits April 2, 2020 16:39
* gui/server test framework

* pylint check & format code

* gui/server test framework except query

* spark & service module test

* service test fro pointmap

* add /db/query test case

* pylint check & format code

* add small csv to support ci

* empty commit to trigger ci

* tests for restful api

* test for restful api done

* gui/server add load api

* gui/server weighted_pointmap supported

* load config from command line

* remove dependency of app.common.config

* [skip ci] pylint check & format code

* [skip ci] add load logic for restful api test

* limit package version of flask-cors

* limit package version of restful api test

* [skip ci] fix some bug of server with standalone spark cluster

* [skip ci] resolve conflicts

* change id to string type

* resolve conflicts

* [skip ci] change db id to hex string

* [skip ci] fix table name issue
* fix wrong choroplethmap when png size is small

* fix wrong choroplethmap when png size is small

* add test for transform_projection

* format projection test

* add agg type for weight

* add agg type for weight

* fix code to pass lint

* fix code to pass lint

* rename vega in python, and modify vega api, vega unittest

* rename vega in cpp

* vega rename in spark

* rename render params in c++

* refactor render python/spark interface

* code format cpp

* code format python

* rename render in gui/server

* change vega dataframe order in server

* alter test/draw_draw_map_test

* alter vega param names in server README

* fix render's python test to pass wkb input

Co-authored-by: sheep <954206947@qq.com>
…environment (#438)

* fix config

* delete unused config

* revert change
speed up  st_within if input is point and circle
* add api doc

* add api doc

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* add html

* one page one api

* add line break

* add rst style comment

* add rst style comment

* add rst style comment

* add rst style comment

* add rst style comment

* add rst style comment

* add logo

* add logo

* add logo

* add logo

* add logo

* add comment for python wrap function

* add comment for python wrap function

* add api-doc

* add api-doc

* add api-doc

* change html struct

* change html struct

* change html struct

* change html struct

* change html struct

* change html struct

* change html struct

* change html struct

* change html struct

* change html struct

* add functions comment

* add logo

* change html struct

* adjust html struct

* adjust html struct

* adjust html struct

* add png

* add _static

* delete class graph

* add logo

* xxx

* xxx

* xxx

* xxx

* delete graph

* delete file

* add replace.py

* ...

* add how to create html in arctern doc

* add how to create html in arctern doc

* add how to create html in arctern doc

* add how to create html in arctern doc

* add how to create html in arctern doc

* add how to create html in arctern doc

* add how to create html in arctern doc

* add how to create html in arctern doc

* ...

* delete api-doc

* delete api-doc

* alter comment

Co-authored-by: peng.liu <peng.liu@zilliz.com>
* gui/server test framework

* pylint check & format code

* gui/server test framework except query

* spark & service module test

* service test fro pointmap

* add /db/query test case

* pylint check & format code

* add small csv to support ci

* empty commit to trigger ci

* tests for restful api

* test for restful api done

* gui/server add load api

* gui/server weighted_pointmap supported

* load config from command line

* remove dependency of app.common.config

* [skip ci] pylint check & format code

* [skip ci] add load logic for restful api test

* limit package version of flask-cors

* limit package version of restful api test

* [skip ci] fix some bug of server with standalone spark cluster

* [skip ci] resolve conflicts

* change id to string type

* resolve conflicts

* [skip ci] change db id to hex string

* [skip ci] change sql case of server test

* [skip ci] update doc of gui/server
* Add Flask Dockerfile

* Update Flask Dockerfile

* Update Flask Dockerfile

* Update Flask Dockerfile

* Rename Conda package arctern to pyarctern

* update arctern-spark conda mete.yml

* update arctern-spark conda mete.yml

* update arctern flask Dockerfile

* update arctern flask Dockerfile

* update arctern flask Dockerfile

* update arctern flask Dockerfile

* update arctern flask Dockerfile

* update arctern flask Dockerfile

* update arctern flask Dockerfile

* update arctern flask Dockerfile

* update arctern flask Dockerfile

* update arctern flask Dockerfile

* add restful api regression

* add restful api regression

* Update Jenkinsfile

* Update test environment docker compose file

* Update test environment docker compose file

* Update test environment docker compose file

* Update test environment docker compose file

* Update test environment docker compose file

* Update test environment docker compose file

* Update test environment docker compose file

* Update test environment docker compose file

* Update test environment docker compose file

* Update test environment docker compose file

* Debug docker compose

* print flask server logs

* print flask server logs
Co-authored-by: czp <zhipeng.cao@zilliz.com>
@xige-16 xige-16 merged commit 4fdcd94 into xige-16:master Apr 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants