Merge lp://staging/~elachuni/rnr-server/precise into lp://staging/rnr-server

Proposed by Anthony Lenton
Status: Merged
Approved by: Anthony Lenton
Approved revision: 231
Merged at revision: 231
Proposed branch: lp://staging/~elachuni/rnr-server/precise
Merge into: lp://staging/rnr-server
Diff against target: 75 lines (+21/-13)
2 files modified
fabtasks/bootstrap.py (+18/-11)
requirements.txt (+3/-2)
To merge this branch: bzr merge lp://staging/~elachuni/rnr-server/precise
Reviewer Review Type Date Requested Status
Michael Nelson (community) Approve
Review via email: mp+150425@code.staging.launchpad.net

Commit message

Updated requirements to work on precise.

Description of the change

This branch makes rnr-server work with precise, so that our test suite passes on Jenkins.

Ironically, staging and production still run lucid. We should fix that soon, before we have some "oops-I-used-this-python-2.7-specific-method" issue on production.

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

All good - assuming you've verified that this branch passes on both lucid and precise. Great!

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

The attempt to merge lp:~elachuni/rnr-server/precise 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 11))
  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 configglue==1.0.1 (from -r requirements.txt (line 4))
  Downloading configglue-1.0.1.tar.gz
  Running setup.py egg_info for package configglue

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

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking django-configglue==0.6.1 (from -r requirements.txt (line 6))
  Downloading django-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
Downloading/unpacking django-openid-auth==0.2 (from -r requirements.txt (line 7))
  Downloading django-openid-auth-0.2.tar.gz
  Running setup.py egg_info for package django-openid-auth

Downloading/unpacking django-piston (from -r requirements.txt (line 8))
  Downloading django-piston-0.2.3.tar.gz
  Running setup.py egg_info for package django-piston

Downloading/unpacking django-preflight (from -r requirements.txt (line 9))
  Downloading django-preflight-0.1.4.tar.gz
  Running setup.py egg_info for package django-preflight

Downloading/unpacking django==1.3 (from -r requirements.txt (line 10))
  Running setup.py egg_info for package django

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

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

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

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

Downloading/unpacking mock (from -r requirements.txt (line 16))
  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'
Downloa...

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

The attempt to merge lp:~elachuni/rnr-server/precise 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 11))
  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 configglue==1.0.1 (from -r requirements.txt (line 4))
  Downloading configglue-1.0.1.tar.gz
  Running setup.py egg_info for package configglue

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

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking django-configglue==0.6.1 (from -r requirements.txt (line 6))
  Downloading django-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
Downloading/unpacking django-openid-auth==0.2 (from -r requirements.txt (line 7))
  Downloading django-openid-auth-0.2.tar.gz
  Running setup.py egg_info for package django-openid-auth

Downloading/unpacking django-piston (from -r requirements.txt (line 8))
  Downloading django-piston-0.2.3.tar.gz
  Running setup.py egg_info for package django-piston

Downloading/unpacking django-preflight (from -r requirements.txt (line 9))
  Downloading django-preflight-0.1.4.tar.gz
  Running setup.py egg_info for package django-preflight

Downloading/unpacking django==1.3 (from -r requirements.txt (line 10))
  Running setup.py egg_info for package django

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

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

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

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

Downloading/unpacking mock (from -r requirements.txt (line 16))
  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'
Downloa...

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