Skip to content

Conversation

@mkoistinen
Copy link
Contributor

Fixes #3604

@mkoistinen
Copy link
Contributor Author

Failed builds due to lack of StringIO module in Python 3.x. This is actually an issue in the related PR #3613, which this PR depends on.

@yakky
Copy link
Member

yakky commented Nov 26, 2014

@mkoistinen get StringIO from the six package bundled in Django

@coveralls
Copy link

coveralls commented Nov 26, 2014

Coverage Status

Coverage decreased (-0.8%) to 86.552% when pulling ee5acb6 on mkoistinen:fix_3604 into aba0a14 on divio:support/3.0.x.

@mkoistinen
Copy link
Contributor Author

@yakky, fixed issues with Python 3.x. Now, as predicted, issues with Django 1.7. In this case, because the test runner is attempting to inherit from a model with different migration type. Help?

@yakky yakky modified the milestones: 3.0.X, 3.0.8 Nov 27, 2014
@yakky
Copy link
Member

yakky commented Jan 4, 2015

@mkoistinen can you remove the changes to develop.py and integrate the django 1.7 migrations ?

@mkoistinen
Copy link
Contributor Author

Done!

@mkoistinen
Copy link
Contributor Author

Just rebased it to current support/3.0.x

@yakky
Copy link
Member

yakky commented Jan 11, 2015

👍 waiting for tests to complete

develop.py Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now useless, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, removed.

On Sun, Jan 11, 2015 at 11:20 PM, Iacopo Spalletti <notifications@github.com

wrote:

In develop.py
#3611 (diff):

@@ -189,40 +208,62 @@ def shell():
call_command('shell')

+class capture_all_output(object):

This is now useless, right?

Reply to this email directly or view it on GitHub
https://github.com/divio/django-cms/pull/3611/files#r22770187.

MARTIN KOISTINEN

BG GSM +359 878 787 253UK GSM +44 7703 046 154
UK VoIP +44 20 3286 9932
_US VoIP +1 (__678) _389-6676

100% CARBON-NEUTRAL SINCE 1-JAN-2008

@yakky yakky mentioned this pull request Jan 12, 2015
@yakky yakky merged commit 607404f into django-cms:support/3.0.x Jan 12, 2015
yakky added a commit that referenced this pull request Jan 12, 2015
@mkoistinen mkoistinen deleted the fix_3604 branch February 20, 2015 23:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants