Merge lp://staging/~fgallina/rnr-server/django16 into lp://staging/rnr-server

Proposed by Fabián Ezequiel Gallina
Status: Merged
Approved by: Fabián Ezequiel Gallina
Approved revision: 263
Merged at revision: 254
Proposed branch: lp://staging/~fgallina/rnr-server/django16
Merge into: lp://staging/rnr-server
Diff against target: 854 lines (+348/-160)
18 files modified
.bzrignore (+5/-0)
django_project/config_dev/config/main.cfg (+4/-0)
django_project/manage.py (+10/-16)
fabtasks/bootstrap.py (+26/-3)
requirements.txt (+0/-5)
src/clickreviews/tests/__init__.py (+0/-11)
src/clickreviews/tests/factory.py (+7/-2)
src/clickreviews/tests/test_handlers.py (+60/-55)
src/reviewsapp/migrations/0016_update_permissions.py (+186/-0)
src/reviewsapp/models/reviews.py (+1/-1)
src/reviewsapp/preflight.py (+4/-3)
src/reviewsapp/schema.py (+1/-1)
src/reviewsapp/tests/__init__.py (+0/-37)
src/reviewsapp/tests/factory.py (+4/-0)
src/reviewsapp/tests/helpers.py (+26/-1)
src/reviewsapp/tests/test_handlers.py (+3/-1)
src/reviewsapp/tests/test_middleware.py (+0/-24)
src/reviewsapp/tests/test_wsgi.py (+11/-0)
To merge this branch: bzr merge lp://staging/~fgallina/rnr-server/django16
Reviewer Review Type Date Requested Status
Matias Bordese (community) Approve
Review via email: mp+228332@code.staging.launchpad.net

Commit message

Upgrade to Django 1.6.5

To post a comment you must log in.
Revision history for this message
Matias Bordese (matiasb) wrote :

LGTM

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (60.4 KiB)

The attempt to merge lp:~fgallina/rnr-server/django16 into lp:rnr-server failed. Below is the output from the failed tests.

[localhost] local: /usr/bin/python /usr/bin/virtualenv --no-site-packages virtualenv
The --no-site-packages flag is deprecated; it is now the default behavior.
New python executable in virtualenv/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
[localhost] local: virtualenv/bin/pip install -r requirements.txt
Downloading/unpacking http://corey-projects.googlecode.com/files/linux_metrics-0.1.0.tar.gz (from -r requirements.txt (line 9))
  Downloading linux_metrics-0.1.0.tar.gz
  Running setup.py egg_info for package from http://corey-projects.googlecode.com/files/linux_metrics-0.1.0.tar.gz

Downloading/unpacking bzr (from -r requirements.txt (line 5))
  Running setup.py egg_info for package bzr
    No Cython, trying Pyrex...

    The python package 'Pyrex' is not available. If the .c files are available,
    they will be built, but modifying the .pyx files will not rebuild them.

Downloading/unpacking coverage (from -r requirements.txt (line 6))
  Running setup.py egg_info for package coverage

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking django-pgtools==0.1 (from -r requirements.txt (line 7))
  Running setup.py egg_info for package django-pgtools

Downloading/unpacking django-factory==0.11 (from -r requirements.txt (line 8))
  Downloading django_factory-0.11.tar.gz
  Running setup.py egg_info for package django-factory

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking httplib2==0.6.0 (from -r requirements.txt (line 10))
  Running setup.py egg_info for package httplib2

Downloading/unpacking launchpadlib==1.9.12 (from -r requirements.txt (line 11))
  Running setup.py egg_info for package launchpadlib

Downloading/unpacking lazr.restfulclient==0.12.0 (from -r requirements.txt (line 12))
  Running setup.py egg_info for package lazr.restfulclient

Downloading/unpacking mechanize (from -r requirements.txt (line 13))
  Running setup.py egg_info for package mechanize

Downloading/unpacking mock (from -r requirements.txt (line 14))
  Running setup.py egg_info for package mock

    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found matching '*.html' under directory 'docs'
    warning: no files found matching '*.js' under directory 'docs'
Downloading/unpacking oauthlib (from -r requirements.txt (line 15))
  Running setup.py egg_info for package oauthlib

Downloading/unpacking oops==0.0.13 (from -r requirements.txt (line 16))
  Downloading oops-0.0.13.tar.gz
  Running setup.py egg_info for package oops

Downloading/unpacking oops-datedir-repo==0.0.21 (from -r requirements.txt (line 17))
  Downloading oops_datedir_repo-0.0.21.tar.gz
...

263. By Fabián Ezequiel Gallina

Fixes for sqlite based test runs

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