Merge branch 'fcvarela-develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-sdk-python/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-sdk-python/commit/77ef0dd3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-sdk-python/tree/77ef0dd3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-sdk-python/diff/77ef0dd3 Branch: refs/heads/master Commit: 77ef0dd39669157a18ca1ff260e735107eeb8e82 Parents: b85d044 7b6e210 Author: EmergentOrder <[email protected]> Authored: Tue Nov 3 13:04:46 2015 -0400 Committer: EmergentOrder <[email protected]> Committed: Tue Nov 3 13:04:46 2015 -0400 ---------------------------------------------------------------------- .gitignore | 4 + docs/source/conf.py | 110 +- examples/demo-movielens/appdata.py | 316 ++--- examples/demo-movielens/batch_import.py | 246 ++-- examples/event_sample.py | 48 +- examples/import_yahoo.py | 261 ++-- examples/itemrank_quick_query.py | 18 +- examples/itemrank_quick_start.py | 69 +- examples/obsolete/__init__.py | 0 examples/obsolete/itemrec/__init__.py | 0 examples/obsolete/itemrec/movies/.gitignore | 3 - examples/obsolete/itemrec/movies/README.md | 15 - examples/obsolete/itemrec/movies/__init__.py | 0 examples/obsolete/itemrec/movies/app_config.py | 2 - examples/obsolete/itemrec/movies/appdata.py | 148 --- .../obsolete/itemrec/movies/batch_import.py | 65 - .../obsolete/itemrec/movies/movie_rec_app.py | 152 --- predictionio/__init__.py | 40 +- predictionio/connection.py | 537 ++++---- predictionio/obsolete.py | 1205 ------------------ setup.py | 32 +- tests-obsolete/conversion_test.py | 16 + tests-obsolete/import_testdata.py | 46 + tests-obsolete/import_testdata_id_mismatch.py | 46 + tests-obsolete/import_testdata_special_char.py | 46 + tests-obsolete/predictionio_itemrec_test.py | 336 +++++ .../predictionio_itemrec_test_special_char.py | 366 ++++++ tests-obsolete/predictionio_itemsim_test.py | 200 +++ tests-obsolete/predictionio_test.py | 257 ++++ tests/.keep | 0 tests/conversion_test.py | 23 - tests/import_testdata.py | 52 - tests/import_testdata_id_mismatch.py | 52 - tests/import_testdata_special_char.py | 52 - tests/predictionio_itemrec_test.py | 300 ----- tests/predictionio_itemrec_test_special_char.py | 291 ----- tests/predictionio_itemsim_test.py | 160 --- tests/predictionio_test.py | 246 ---- tox.ini | 9 + 39 files changed, 2171 insertions(+), 3598 deletions(-) ----------------------------------------------------------------------
