Merge into trunk : dependencies-enhancements : Code : Ratings and Reviews server

Status:	Merged
Approved by:	Fabián Ezequiel Gallina on 2014-08-05
Approved revision:	270
Merged at revision:	258
Proposed branch:	lp://staging/~fgallina/rnr-server/dependencies-enhancements
Merge into:	lp://staging/rnr-server
Diff against target:	832 lines (+166/-461) 14 files modified Makefile (+38/-0) config-manager.txt (+39/-0) django_project/manage.py (+4/-0) django_project/paths.py (+36/-0) django_project/settings.py (+15/-13) fabtasks/__init__.py (+0/-2) fabtasks/bootstrap.py (+0/-193) fabtasks/deploy.py (+0/-111) fabtasks/django.py (+1/-1) fabtasks/load_testing.py (+22/-9) requirements.txt (+5/-19) space-shuttle/fabfile.py (+0/-104) src/reviewsapp/tests/test_wsgi.py (+3/-4) tarmac_verify.sh (+3/-5)
To merge this branch:	bzr merge lp://staging/~fgallina/rnr-server/dependencies-enhancements
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ricardo Kirkner (community)		2014-08-05	Approve on 2014-08-05
Review via email: mp+229618@code.staging.launchpad.net

Commit message

Move config-manager to tree, update sourcedeps and path initialization, plus simplify project bootstrap for devs.

This work fixed most of dependencies to use the appropiate sourcedeps, also moved the config-manager.txt to main branch, and removed fab tasks related to setup environment and bootstrap.

This also includes a simplification on the management of sourcedeps to use the synced modules in the branches folder by being pointed to their correct paths in libs and setup of these paths early on the project tear up in order to get rid of the use and repetition of manage.py and others from the rnr-config branch.

Description of the change

Work towards the simplification and upgrade of RnR setup

This work fixed most of dependencies to use the appropiate sourcedeps, also moved the config-manager.txt to main branch, and removed fab tasks related to setup environment and bootstrap.

This also includes a simplification on the management of sourcedeps to use the synced modules in the branches folder by being pointed to their correct paths in libs and setup of these paths early on the project tear up in order to get rid of the use and repetition of manage.py and others from the rnr-config branch.

Revision history for this message

Ricardo Kirkner (ricardokirkner) wrote on 2014-08-05:

#

LGTM, please fix import order, then you can land the branch

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2014-08-05:

#

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

sed: can't read ./django_project/.config/logging.conf: No such file or directory

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2014-08-05:

#

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

sed -e '1,/# Dependencies/d;s/^rnr-server/./g;s/bazaar.isd/bazaar.launchpad.net/g' config-manager.txt > config-manager.txt.tmp
/usr/lib/config-manager/cm.py update config-manager.txt.tmp
./virtualenv/bin/pip install -r requirements.txt

make: ./virtualenv/bin/pip: Command not found
make: *** [install-virtualenv-requirements] Error 127

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2014-08-05:

#

Download full text (3.4 KiB)

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

rm -rf ./virtualenv
sed -e '1,/# Dependencies/d;s/^rnr-server/./g;s/bazaar.isd/bazaar.launchpad.net/g' config-manager.txt > config-manager.txt.tmp
/usr/lib/config-manager/cm.py update config-manager.txt.tmp
Not deleting ./virtualenv/bin
New python executable in ./virtualenv/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
./virtualenv/bin/pip install -r requirements.txt
Requirement already satisfied (use --upgrade to upgrade): coverage in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 4))
Downloading/unpacking django-factory==0.11 (from -r requirements.txt (line 5))
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
Requirement already satisfied (use --upgrade to upgrade): mechanize in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 6))
Requirement already satisfied (use --upgrade to upgrade): mock in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 7))
Requirement already satisfied (use --upgrade to upgrade): paste==1.7.5.1 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 8))
Requirement already satisfied (use --upgrade to upgrade): pep8 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 9))
Requirement already satisfied (use --upgrade to upgrade): piston-mini-client in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 10))
Requirement already satisfied (use --upgrade to upgrade): testtools in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 11))
Downloading/unpacking unittest-xml-reporting==1.9.0 (from -r requirements.txt (line 12))
  Downloading unittest-xml-reporting-1.9.0.tar.gz
  Running setup.py egg_info for package unittest-xml-reporting

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

Requirement already satisfied (use --upgrade to upgrade): django>=1.1 in /usr/lib/python2.7/dist-packages (from django-factory==0.11->-r requirements.txt (line 5))
Requirement already satisfied (use --upgrade to upgrade): six in /usr/lib/python2.7/dist-packages (from unittest-xml-reporting==1.9.0->-r requirements.txt (line 12))
Installing collected packages: django-factory, unittest-xml-reporting, wsgi-intercept
Running setup.py install for django-factory

warning: no previously-included files matching '*.pyc' found anywhere in distribution
Running setup.py install for unittest-xml-reporting

Running setup.py install for wsgi-intercept

Successfully installed django-factory unittest-xml-reporting wsgi-intercept
Cleaning up...
[localhost] local: rm -rf .coverage coverage/ coverage.xml
[localhost] local: virtualenv/bin/coverage run --bra...

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

rm -rf ./virtualenv
sed -e '1,/# Dependencies/d;s/^rnr-server/./g;s/bazaar.isd/bazaar.launchpad.net/g' config-manager.txt > config-manager.txt.tmp
/usr/lib/config-manager/cm.py update config-manager.txt.tmp
Not deleting ./virtualenv/bin
New python executable in ./virtualenv/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
./virtualenv/bin/pip install -r requirements.txt
Requirement already satisfied (use --upgrade to upgrade): coverage in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 4))
Downloading/unpacking django-factory==0.11 (from -r requirements.txt (line 5))
  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
Requirement already satisfied (use --upgrade to upgrade): mechanize in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 6))
Requirement already satisfied (use --upgrade to upgrade): mock in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 7))
Requirement already satisfied (use --upgrade to upgrade): paste==1.7.5.1 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 8))
Requirement already satisfied (use --upgrade to upgrade): pep8 in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 9))
Requirement already satisfied (use --upgrade to upgrade): piston-mini-client in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 10))
Requirement already satisfied (use --upgrade to upgrade): testtools in /usr/lib/python2.7/dist-packages (from -r requirements.txt (line 11))
Downloading/unpacking unittest-xml-reporting==1.9.0 (from -r requirements.txt (line 12))
  Downloading unittest-xml-reporting-1.9.0.tar.gz
  Running setup.py egg_info for package unittest-xml-reporting
    
Downloading/unpacking wsgi-intercept==0.5.1 (from -r requirements.txt (line 13))
  Running setup.py egg_info for package wsgi-intercept
    
Requirement already satisfied (use --upgrade to upgrade): django>=1.1 in /usr/lib/python2.7/dist-packages (from django-factory==0.11->-r requirements.txt (line 5))
Requirement already satisfied (use --upgrade to upgrade): six in /usr/lib/python2.7/dist-packages (from unittest-xml-reporting==1.9.0->-r requirements.txt (line 12))
Installing collected packages: django-factory, unittest-xml-reporting, wsgi-intercept
  Running setup.py install for django-factory
    
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
  Running setup.py install for unittest-xml-reporting
    
  Running setup.py install for wsgi-intercept
    
Successfully installed django-factory unittest-xml-reporting wsgi-intercept
Cleaning up...
[localhost] local: rm -rf .coverage coverage/ coverage.xml
[localhost] local: virtualenv/bin/coverage run --branch django_project/manage.py test reviewsapp clickreviews

/bin/sh: 1: virtualenv/bin/coverage: not found

Fatal error: local() encountered an error (return code 127) while executing 'virtualenv/bin/coverage run --branch django_project/manage.py test reviewsapp clickreviews'

Aborting.

lp://staging/~fgallina/rnr-server/dependencies-enhancements updated on 2014-08-05

270. By Fabián Ezequiel Gallina on 2014-08-05: More robust coverage invocation

Ratings and Reviews server

Merge lp://staging/~fgallina/rnr-server/dependencies-enhancements into lp://staging/rnr-server

Commit message

Description of the change

Preview Diff

Subscribers