Merge lp:~cjohnston/summit/django-openid-auth-version into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 518
Merged at revision: 518
Proposed branch: lp:~cjohnston/summit/django-openid-auth-version
Merge into: lp:summit
Diff against target: 25 lines (+2/-2)
2 files modified
requirements.txt (+1/-1)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/django-openid-auth-version
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+157521@code.launchpad.net

Commit message

Updates django-openid-auth to use 0.5

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :
Download full text (204.6 KiB)

The attempt to merge lp:~chrisjohnston/summit/django-openid-auth-version into lp:summit failed. Below is the output from the failed tests.

 * Adding Bzr Apps: added.
* Pulling Bzr Apps
* Pulling Bzr Apps complete.
Creating test database for alias 'default'...
Auto-scheduling uds-test
Schedule meeting2 in testroom at 2013-04-12 01:47..02:47
Warning: required people not available:
meeting2 (None) at 2013-04-12 01:47..02:47 in testroom: testuser
Auto-scheduling uds-test
Schedule meeting2 in testroom at 2013-04-11 17:17..18:17
Auto-scheduling uds-test
-- could not schedule meeting2 in testroom at 2013-04-11 09:17..10:17 (Required people not available: testuser)
Gave up scheduling meeting2
-- could not schedule meeting2 in testroom at 2013-04-11 09:17..10:17 (Required people not available: testuser)
Gave up scheduling meeting2
Schedule testmeeting in testroom at 2013-04-06 13:17..14:17
-- could not schedule testmeeting in testroom at 2013-04-06 19:17..20:17 (Room has no dial-in capability)
Auto-scheduling uds-test
Schedule meeting1 in at 2013-04-06 12:17..13:17
Not scheduling private meeting: meeting2
Not scheduling private meeting: meeting2
Auto-scheduling uds-test
Gave up scheduling meeting1
Not scheduling private meeting: meeting2
Gave up scheduling meeting1
Not scheduling private meeting: meeting2
Auto-scheduling uds-test
Schedule meeting1 in at 2013-04-06 19:17..20:17
Not scheduling private meeting: meeting2
Not scheduling private meeting: meeting2
Auto-scheduling uds-test
-- could not schedule meeting1 in at 2013-04-06 12:17..13:17 (Required people not available: testuser)
Gave up scheduling meeting1
-- could not schedule meeting1 in at 2013-04-06 12:17..13:17 (Required people not available: testuser)
Gave up scheduling meeting1
user testuser
Error: bqcggakamukdcxdgcqlstrxwutnobztcukahjmzfxxwoprywxtdmevwbaengboudsgdzfneeyizdhbrseapcihtutclswfrykjjt at 2013-04-07 01:17..02:17 in : Insufficient slots available
Warning: required people not available:
vfddbrpkzxsnqiaphgcjrqldtapdigfvaqldglsxodknvfgjubjylhprrhdltjyahidsdochaoswmaetylsgkcuvjpisrnczudzh (None) at 2013-04-06 14:47..15:47 in : cnahdNjrcCkWeRvwFfCxmDNMHgkuaH
Warning: required people not available:
hjcvtdujsbfkxsjfqkgrdsltsimjgmcnfkdikqqqicxerphskzprntidrcejqrsrjyutgxwjkeaxtsudzynyfaamfsborejessev (None) at 2013-04-06 17:17..18:17 in : CotZCULEgnTleBWkkfeAlTrAmhXzMe
user testuser
user testuser
Importing from https://launchpad.net/sprints//+temp-meeting-export
Marking name as removed
Importing from https://launchpad.net/sprints//+temp-meeting-export
Marking name as removed
Importing from https://launchpad.net/sprints//+temp-meeting-export
meeting other
Importing from https://launchpad.net/sprints//+temp-meeting-export
meeting foo
Importing from https://launchpad.net/sprints//+temp-meeting-export
meeting other
Marking name as removed
Importing from http://example.com/test1
Importing from http://example.com/test2
Importing from https://launchpad.net/sprints//+temp-meeting-export
Importing from https://launchpad.net/sprints//+temp-meeting-export
meeting other
Marking name as removed
meeting meeting-name
meeting very very very very very very very very very very very very very very very...

Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

The attempt to merge lp:~chrisjohnston/summit/django-openid-auth-version into lp:summit failed. Below is the output from the failed tests.

 * Adding Bzr Apps: added.
* Pulling Bzr Apps
* Pulling Bzr Apps complete.

python: can't open file 'manage.py': [Errno 2] No such file or directory

Revision history for this message
Chris Johnston (cjohnston) wrote :
Download full text (205.2 KiB)

The attempt to merge lp:~chrisjohnston/summit/django-openid-auth-version into lp:summit failed. Below is the output from the failed tests.

You will need to run ./manage.py init-summit to make The Summit Scheduler fully work.
Creating test database for alias 'default'...
Auto-scheduling uds-test
Schedule meeting2 in testroom at 2013-04-11 18:36..19:36
Warning: required people not available:
meeting2 (None) at 2013-04-11 18:36..19:36 in testroom: testuser
Auto-scheduling uds-test
Schedule meeting2 in testroom at 2013-04-11 12:36..13:36
Auto-scheduling uds-test
-- could not schedule meeting2 in testroom at 2013-04-12 00:36..01:36 (Required people not available: testuser)
Gave up scheduling meeting2
-- could not schedule meeting2 in testroom at 2013-04-12 00:36..01:36 (Required people not available: testuser)
Gave up scheduling meeting2
Schedule testmeeting in testroom at 2013-04-06 13:36..14:36
-- could not schedule testmeeting in testroom at 2013-04-06 13:36..14:36 (Room has no dial-in capability)
Auto-scheduling uds-test
Schedule meeting1 in at 2013-04-07 00:36..01:36
Not scheduling private meeting: meeting2
Not scheduling private meeting: meeting2
Auto-scheduling uds-test
Gave up scheduling meeting1
Not scheduling private meeting: meeting2
Gave up scheduling meeting1
Not scheduling private meeting: meeting2
Auto-scheduling uds-test
Schedule meeting1 in at 2013-04-06 19:36..20:36
Not scheduling private meeting: meeting2
Not scheduling private meeting: meeting2
Auto-scheduling uds-test
-- could not schedule meeting1 in at 2013-04-06 13:36..14:36 (Required people not available: testuser)
Gave up scheduling meeting1
-- could not schedule meeting1 in at 2013-04-06 13:36..14:36 (Required people not available: testuser)
Gave up scheduling meeting1
user testuser
Error: gufqtezzovbjujrecgimkpvtkfqqoyqpicwhkfthkkbyzgzxxuldgmrynnqyhryfifnefyowjqukjbluknoicmhnypojdkakrqwi at 2013-04-06 19:36..20:36 in : Insufficient slots available
Warning: required people not available:
jpjclwtfdinposidxicyxjsppzcwvrbdmxjbhyqwkjgwelooermxqkrwnkhlqyuvoruwvehtxtxgfggzdbiboshmtmtxpgzrozkf (None) at 2013-04-06 19:36..20:36 in : VZDkjoJgwOTNerBWKmDrdBxemhpoHf
Warning: required people not available:
gjtqecuvetybvbbwbbxzximfsfoyufnqrnocmxmyxvbvfjisbxlnsbdegswknlpoemskopyahcxngoszdhwkxjlozihptvicjiwz (None) at 2013-04-06 14:36..15:36 in : MQZLYwPmwfDGspwyITfDtyihtybsIw
user testuser
user testuser
Importing from https://launchpad.net/sprints//+temp-meeting-export
Marking name as removed
Importing from https://launchpad.net/sprints//+temp-meeting-export
Marking name as removed
Importing from https://launchpad.net/sprints//+temp-meeting-export
meeting other
Importing from https://launchpad.net/sprints//+temp-meeting-export
meeting foo
Importing from https://launchpad.net/sprints//+temp-meeting-export
meeting other
Marking name as removed
Importing from http://example.com/test1
Importing from http://example.com/test2
Importing from https://launchpad.net/sprints//+temp-meeting-export
Importing from https://launchpad.net/sprints//+temp-meeting-export
meeting other
Marking name as removed
meeting meeting-name
meeting very very very very very very very very very very very very ver...

Revision history for this message
Chris Johnston (cjohnston) wrote :

The attempt to merge lp:~chrisjohnston/summit/django-openid-auth-version into lp:summit failed. Below is the output from the failed tests.

 * Adding Bzr Apps: added.
* Pulling Bzr Apps
* Pulling Bzr Apps complete.

Traceback (most recent call last):
  File "summit/manage.py", line 13, in <module>
    execute_manager(settings)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 459, in execute_manager
    utility.execute()
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 382, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 261, in fetch_command
    klass = load_command_class(app_name, subcommand)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 69, in load_command_class
    module = import_module('%s.management.commands.%s' % (app_name, name))
  File "/usr/lib/python2.7/dist-packages/django/utils/importlib.py", line 35, in import_module
    __import__(name)
  File "/usr/lib/python2.7/dist-packages/django/core/management/commands/test.py", line 7, in <module>
    from django.test.utils import get_runner
  File "/usr/lib/python2.7/dist-packages/django/test/__init__.py", line 5, in <module>
    from django.test.client import Client, RequestFactory
  File "/usr/lib/python2.7/dist-packages/django/test/client.py", line 21, in <module>
    from django.test import signals
  File "/usr/lib/python2.7/dist-packages/django/test/signals.py", line 2, in <module>
    from django.db import connections
  File "/usr/lib/python2.7/dist-packages/django/db/__init__.py", line 11, in <module>
    if DEFAULT_DB_ALIAS not in settings.DATABASES:
  File "/usr/lib/python2.7/dist-packages/django/utils/functional.py", line 184, in inner
    self._setup()
  File "/usr/lib/python2.7/dist-packages/django/conf/__init__.py", line 42, in _setup
    self._wrapped = Settings(settings_module)
  File "/usr/lib/python2.7/dist-packages/django/conf/__init__.py", line 95, in __init__
    raise ImportError("Could not import settings '%s' (Is it on sys.path?): %s" % (self.SETTINGS_MODULE, e))
ImportError: Could not import settings 'summit/ubuntu_settings' (Is it on sys.path?): Import by filename is not supported.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'requirements.txt'
2--- requirements.txt 2013-03-19 15:56:22 +0000
3+++ requirements.txt 2013-04-06 15:49:21 +0000
4@@ -10,7 +10,7 @@
5 South==0.7.5
6 bzr>=2.4b4
7 distribute==0.6.10
8-django-openid-auth==0.4
9+django-openid-auth==0.5
10 # psycopg2==2.0.13 - only needed for production like environments
11 python-openid==2.2.4
12 pytz==2010b
13
14=== modified file 'setup.py'
15--- setup.py 2013-03-09 05:05:25 +0000
16+++ setup.py 2013-04-06 15:49:21 +0000
17@@ -46,7 +46,7 @@
18 "pytz",
19 "BeautifulSoup",
20 "python-openid",
21- "django-openid-auth",
22+ "django-openid-auth>=0.5",
23 "South>=0.6",
24 ],
25 data_files = data_files,

Subscribers

People subscribed via source and target branches