Merge lp://qastaging/~jml/pkgme-service/os-version into lp://qastaging/pkgme-service

Proposed by Jonathan Lange
Status: Merged
Approved by: James Westby
Approved revision: 105
Merged at revision: 103
Proposed branch: lp://qastaging/~jml/pkgme-service/os-version
Merge into: lp://qastaging/pkgme-service
Diff against target: 35 lines (+8/-1)
2 files modified
src/djpkgme/preflight.py (+3/-0)
src/djpkgme/tests/test_preflight.py (+5/-1)
To merge this branch: bzr merge lp://qastaging/~jml/pkgme-service/os-version
Reviewer Review Type Date Requested Status
Canonical Consumer Applications Hackers Pending
Review via email: mp+118078@code.qastaging.launchpad.net

Commit message

Include OS & Python version on preflight page.

Description of the change

Adds the Python and OS version to the preflight page. Here's what they look like:

$ python -c 'import platform; print platform.platform(1)'
Linux-3.2.0-27-generic-x86_64-with-Ubuntu-12.04-precise

$ python -c 'import sys; print sys.version'
2.7.3 (default, Apr 20 2012, 22:39:59)
[GCC 4.6.3]

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

On Fri, 03 Aug 2012 12:33:19 -0000, Jonathan Lange <email address hidden> wrote:
> Jonathan Lange has proposed merging lp:~jml/pkgme-service/os-version into lp:pkgme-service.
>
> Requested reviews:
> Canonical Consumer Applications Hackers (canonical-ca-hackers)
>
> For more details, see:
> https://code.launchpad.net/~jml/pkgme-service/os-version/+merge/118078
>
> Adds the Python and OS version to the preflight page. Here's what they look like:
>
> $ python -c 'import platform; print platform.platform(1)'
> Linux-3.2.0-27-generic-x86_64-with-Ubuntu-12.04-precise
>
> $ python -c 'import sys; print sys.version'
> 2.7.3 (default, Apr 20 2012, 22:39:59)
> [GCC 4.6.3]

https://pkgme-service-staging.canonical.com/pkgme/+preflight/

already contains the Python version, so I don't think we need to add
that?

Thanks,

James

Revision history for this message
Jonathan Lange (jml) wrote :

Dropped the Python check. Have also upstreamed the Platform check. Leaving this branch to land though, pending a release of django-preflight.

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

The attempt to merge lp:~jml/pkgme-service/os-version into lp:pkgme-service failed. Below is the output from the failed tests.

Fatal error: local() encountered an error (return code 1) while executing 'virtualenv/bin/pip install -r test-dependencies.txt'

Aborting.

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