Merge lp://staging/~canonical-ca-hackers/ubuntu-recommender/944060-tracking-user-actions into lp://staging/ubuntu-recommender

Proposed by Łukasz Czyżykowski
Status: Merged
Approved by: Łukasz Czyżykowski
Approved revision: 66
Merged at revision: 61
Proposed branch: lp://staging/~canonical-ca-hackers/ubuntu-recommender/944060-tracking-user-actions
Merge into: lp://staging/ubuntu-recommender
Diff against target: 388 lines (+275/-1)
6 files modified
src/recommender/api/forms.py (+9/-1)
src/recommender/api/handlers.py (+22/-0)
src/recommender/api/urls.py (+5/-0)
src/recommender/migrations/0016_add_implicitfeedback.py (+163/-0)
src/recommender/models/recommendations.py (+10/-0)
src/recommender/tests/test_api.py (+66/-0)
To merge this branch: bzr merge lp://staging/~canonical-ca-hackers/ubuntu-recommender/944060-tracking-user-actions
Reviewer Review Type Date Requested Status
Anthony Lenton (community) Approve
Review via email: mp+120170@code.staging.launchpad.net

Commit message

Added implicit_feedback api call.

Description of the change

Overview
========
Added implicit_feedback url for gathering user actions. Together with it there's a model where all that info is stored.

To post a comment you must log in.
Revision history for this message
Anthony Lenton (elachuni) wrote :

Awesome Łukasz :D

review: Approve
Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :
Download full text (51.2 KiB)

The attempt to merge lp:~canonical-ca-hackers/ubuntu-recommender/944060-tracking-user-actions into lp:ubuntu-recommender failed. Below is the output from the failed tests.

New python executable in virtualenv/bin/python
Installing distribute..................................................................................................................................................................................done.
Downloading/unpacking configglue==1.0.1 (from -r requirements.txt (line 1))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fc%2Fconfigglue%2Fconfigglue-1.0.1.tar.gz
  Running setup.py egg_info for package configglue
Downloading/unpacking coverage (from -r requirements.txt (line 2))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fc%2Fcoverage%2Fcoverage-3.5.2.tar.gz
  Running setup.py egg_info for package coverage
    no previously-included directories found matching 'test'
Downloading/unpacking django==1.3 (from -r requirements.txt (line 3))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2FD%2FDjango%2FDjango-1.3.tar.gz
  Running setup.py egg_info for package django
Downloading/unpacking django-configglue==0.6.1 (from -r requirements.txt (line 4))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-configglue%2Fdjango-configglue-0.6.1.tar.gz
  Running setup.py egg_info for package django-configglue
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Obtaining django-pgtools from bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk (from -r requirements.txt (line 5))
  Checking out http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk to ./virtualenv/src/django-pgtools
  Running setup.py egg_info for package django-pgtools
Obtaining django-openid-auth from bzr+http://bazaar.launchpad.net/~django-openid-auth/django-openid-auth/trunk (from -r requirements.txt (line 6))
  Checking out http://bazaar.launchpad.net/~django-openid-auth/django-openid-auth/trunk to ./virtualenv/src/django-openid-auth
  Running setup.py egg_info for package django-openid-auth
Downloading/unpacking django-piston==0.2.2.1 (from -r requirements.txt (line 7))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-piston%2Fdjango-piston-0.2.2.1.tar.gz
  Running setup.py egg_info for package django-piston
Downloading/unpacking django-preflight (from -r requirements.txt (line 8))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-preflight%2Fdjango-preflight-0.1.3.tar.gz
  Running setup.py egg_info for package django-preflight
    warning: no files found matching 'templates/preflight/*.html'
Downloading/unpacking django-sentry (from -r requirements.txt (line 9))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-sentry%2Fdjango-sentry-1.13.5.tar.gz
  Running setup.py egg_info for...

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :
Download full text (51.1 KiB)

The attempt to merge lp:~canonical-ca-hackers/ubuntu-recommender/944060-tracking-user-actions into lp:ubuntu-recommender failed. Below is the output from the failed tests.

New python executable in virtualenv/bin/python
Installing distribute..................................................................................................................................................................................done.
Downloading/unpacking configglue==1.0.1 (from -r requirements.txt (line 1))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fc%2Fconfigglue%2Fconfigglue-1.0.1.tar.gz
  Running setup.py egg_info for package configglue
Downloading/unpacking coverage (from -r requirements.txt (line 2))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fc%2Fcoverage%2Fcoverage-3.5.2.tar.gz
  Running setup.py egg_info for package coverage
    no previously-included directories found matching 'test'
Downloading/unpacking django==1.3 (from -r requirements.txt (line 3))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2FD%2FDjango%2FDjango-1.3.tar.gz
  Running setup.py egg_info for package django
Downloading/unpacking django-configglue==0.6.1 (from -r requirements.txt (line 4))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-configglue%2Fdjango-configglue-0.6.1.tar.gz
  Running setup.py egg_info for package django-configglue
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Obtaining django-pgtools from bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk (from -r requirements.txt (line 5))
  Checking out http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk to ./virtualenv/src/django-pgtools
  Running setup.py egg_info for package django-pgtools
Obtaining django-openid-auth from bzr+http://bazaar.launchpad.net/~django-openid-auth/django-openid-auth/trunk (from -r requirements.txt (line 6))
  Checking out http://bazaar.launchpad.net/~django-openid-auth/django-openid-auth/trunk to ./virtualenv/src/django-openid-auth
  Running setup.py egg_info for package django-openid-auth
Downloading/unpacking django-piston==0.2.2.1 (from -r requirements.txt (line 7))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-piston%2Fdjango-piston-0.2.2.1.tar.gz
  Running setup.py egg_info for package django-piston
Downloading/unpacking django-preflight (from -r requirements.txt (line 8))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-preflight%2Fdjango-preflight-0.1.3.tar.gz
  Running setup.py egg_info for package django-preflight
    warning: no files found matching 'templates/preflight/*.html'
Downloading/unpacking django-sentry (from -r requirements.txt (line 9))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-sentry%2Fdjango-sentry-1.13.5.tar.gz
  Running setup.py egg_info for...

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :
Download full text (49.0 KiB)

The attempt to merge lp:~canonical-ca-hackers/ubuntu-recommender/944060-tracking-user-actions into lp:ubuntu-recommender failed. Below is the output from the failed tests.

New python executable in virtualenv/bin/python
Installing distribute..................................................................................................................................................................................done.
Downloading/unpacking configglue==1.0.1 (from -r requirements.txt (line 1))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fc%2Fconfigglue%2Fconfigglue-1.0.1.tar.gz
  Running setup.py egg_info for package configglue
Downloading/unpacking coverage (from -r requirements.txt (line 2))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fc%2Fcoverage%2Fcoverage-3.5.2.tar.gz
  Running setup.py egg_info for package coverage
    no previously-included directories found matching 'test'
Downloading/unpacking django==1.3 (from -r requirements.txt (line 3))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2FD%2FDjango%2FDjango-1.3.tar.gz
  Running setup.py egg_info for package django
Downloading/unpacking django-configglue==0.6.1 (from -r requirements.txt (line 4))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-configglue%2Fdjango-configglue-0.6.1.tar.gz
  Running setup.py egg_info for package django-configglue
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Obtaining django-pgtools from bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk (from -r requirements.txt (line 5))
  Checking out http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk to ./virtualenv/src/django-pgtools
  Running setup.py egg_info for package django-pgtools
Obtaining django-openid-auth from bzr+http://bazaar.launchpad.net/~django-openid-auth/django-openid-auth/trunk (from -r requirements.txt (line 6))
  Checking out http://bazaar.launchpad.net/~django-openid-auth/django-openid-auth/trunk to ./virtualenv/src/django-openid-auth
  Running setup.py egg_info for package django-openid-auth
Downloading/unpacking django-piston==0.2.2.1 (from -r requirements.txt (line 7))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-piston%2Fdjango-piston-0.2.2.1.tar.gz
  Running setup.py egg_info for package django-piston
Downloading/unpacking django-preflight (from -r requirements.txt (line 8))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-preflight%2Fdjango-preflight-0.1.3.tar.gz
  Running setup.py egg_info for package django-preflight
    warning: no files found matching 'templates/preflight/*.html'
Downloading/unpacking django-sentry (from -r requirements.txt (line 9))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-sentry%2Fdjango-sentry-1.13.5.tar.gz
  Running setup.py egg_info for...

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :
Download full text (51.6 KiB)

The attempt to merge lp:~canonical-ca-hackers/ubuntu-recommender/944060-tracking-user-actions into lp:ubuntu-recommender failed. Below is the output from the failed tests.

New python executable in virtualenv/bin/python
Installing distribute..................................................................................................................................................................................done.
Downloading/unpacking configglue==1.0.1 (from -r requirements.txt (line 1))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fc%2Fconfigglue%2Fconfigglue-1.0.1.tar.gz
  Running setup.py egg_info for package configglue
Downloading/unpacking coverage (from -r requirements.txt (line 2))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fc%2Fcoverage%2Fcoverage-3.5.2.tar.gz
  Running setup.py egg_info for package coverage
    no previously-included directories found matching 'test'
Downloading/unpacking django==1.3 (from -r requirements.txt (line 3))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2FD%2FDjango%2FDjango-1.3.tar.gz
  Running setup.py egg_info for package django
Downloading/unpacking django-configglue==0.6.1 (from -r requirements.txt (line 4))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-configglue%2Fdjango-configglue-0.6.1.tar.gz
  Running setup.py egg_info for package django-configglue
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Obtaining django-pgtools from bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk (from -r requirements.txt (line 5))
  Checking out http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk to ./virtualenv/src/django-pgtools
  Running setup.py egg_info for package django-pgtools
Obtaining django-openid-auth from bzr+http://bazaar.launchpad.net/~django-openid-auth/django-openid-auth/trunk (from -r requirements.txt (line 6))
  Checking out http://bazaar.launchpad.net/~django-openid-auth/django-openid-auth/trunk to ./virtualenv/src/django-openid-auth
  Running setup.py egg_info for package django-openid-auth
Downloading/unpacking django-piston==0.2.2.1 (from -r requirements.txt (line 7))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-piston%2Fdjango-piston-0.2.2.1.tar.gz
  Running setup.py egg_info for package django-piston
Downloading/unpacking django-preflight (from -r requirements.txt (line 8))
  Using download cache from /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-preflight%2Fdjango-preflight-0.1.3.tar.gz
  Running setup.py egg_info for package django-preflight
    warning: no files found matching 'templates/preflight/*.html'
Downloading/unpacking django-sentry (from -r requirements.txt (line 9))
  Storing download in cache at /home/ubuntu/.pip/cache/http%3A%2F%2Fpypi.python.org%2Fpackages%2Fsource%2Fd%2Fdjango-sentry%2Fdjango-sentry-1.13.5.tar.gz
  Running setup.py egg_info ...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches