Merge lp://staging/~james-w/python-oops-tools/prod-deploy into lp://staging/python-oops-tools

Proposed by James Westby
Status: Merged
Approved by: James Westby
Approved revision: 54
Merged at revision: 53
Proposed branch: lp://staging/~james-w/python-oops-tools/prod-deploy
Merge into: lp://staging/python-oops-tools
Diff against target: 101 lines (+22/-4)
5 files modified
buildout-templates/src/oopstools/settings.py.in (+14/-1)
production.cfg.example (+2/-1)
setup.py (+2/-0)
src/oopstools/urls.py (+3/-2)
versions.cfg (+1/-0)
To merge this branch: bzr merge lp://staging/~james-w/python-oops-tools/prod-deploy
Reviewer Review Type Date Requested Status
Martin Albisetti (community) Approve
Review via email: mp+138571@code.staging.launchpad.net

Commit message

Add django_openid_auth.

Our production deployment hacks things such that django_openid_auth is used.
This adds it for real.

In addition it adds the common pattern of allowing a local_settings.py
that overrides values in settings.py so that prod can configure things like
the SSO server and the team mappings.

Description of the change

Hi,

This is a step towards cleaning up the prod deploy.

Currently prod runs non-trunk code as it changes a couple of files
to add openid support.

This branch adds the basic support for openid, and allows for configuration
in prod without having to change versioned files. The commit message
has more rationale about the individual changes.

Thanks,

James

To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) :
review: Approve
Revision history for this message
Launchpad PQM Bot (launchpad-pqm) wrote :

The attempt to merge lp:~james-w/python-oops-tools/prod-deploy into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache
python bootstrap.py \
  --setup-source=download-cache/ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/buildout'.
bin/buildout configuration:db-port=5433
Develop: '/home/pqm/pqm-workdir/oops-tools/.'
Couldn't find index page for 'django-openid-auth' (maybe misspelled?)
Getting distribution for 'django-openid-auth==0.4'.

W: line 4 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 3 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [precise]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
Tree is up to date at revision 533 of branch http://bazaar.launchpad.net/~launchpad/lp-source-dependencies/trunk
While:
  Installing.
  Getting section filetemplates.
  Initializing part filetemplates.
  Getting distribution for 'django-openid-auth==0.4'.
Error: Couldn't find a distribution for 'django-openid-auth==0.4'.
make: *** [bin/buildout] Error 1

Revision history for this message
James Westby (james-w) wrote :

Oh yeah, I can't land this until we fix the filename of django-openid-auth in the download-cache.

Thanks,

James

Revision history for this message
Launchpad PQM Bot (launchpad-pqm) wrote :
Download full text (87.6 KiB)

The attempt to merge lp:~james-w/python-oops-tools/prod-deploy into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache
python bootstrap.py \
  --setup-source=download-cache/ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/buildout'.
bin/buildout configuration:db-port=5433
Develop: '/home/pqm/pqm-workdir/oops-tools/.'
Getting distribution for 'django-openid-auth==0.4'.
zip_safe flag not set; analyzing archive contents...
Got django-openid-auth 0.4.
Uninstalling filetemplates.
Updating scripts.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/load_sample_data'.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/prune'.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/analyse_error_reports'.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/dir_finder'.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/amqp2disk'.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/update_db'.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/report'.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/graph_report'.
Generated interpreter '/home/pqm/pqm-workdir/oops-tools/bin/py'.
Installing filetemplates.
Updating django.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/django'.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/test'.
Updating docs.
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/docs'.
Updating tags.
bin/test
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

W: line 4 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 3 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [precise]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
R dist/django-openid-auth_0.4.tar.gz => dist/django-openid-auth-0.4.tar.gz
All changes applied successfully.
Updated to revision 534 of branch http://bazaar.launchpad.net/~launchpad/lp-source-dependencies/trunk
F......F.....FFF.....................EEEEE
======================================================================
ERROR: test_inactive_report (test_report.ReportTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pqm/pqm-workdir/oops-tools/src/oopstools/oops/test/test_report.py", line 39, in test_inactive_report
    resp = self.client.get('/reports/%s/' % (report_name...

54. By James Westby

Add python-openid as django_openid_auth doesn't depend on it.

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

to all changes: