Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WiP Django 1.6 support #1995

Merged
merged 50 commits into from Dec 9, 2013
Merged

WiP Django 1.6 support #1995

merged 50 commits into from Dec 9, 2013

Conversation

yakky
Copy link
Member

@yakky yakky commented Jul 5, 2013

While Django 1.6 is still unreleased, we can try to see what's going to happen.
Still a work in progress and only addresses python-level issues.
All dependencies should be 1.6 ready now.
Biggest issues at the moment are django-reversion (PR opened for 1.6 support) and django-mptt support.
djangocms-text-ckeditor (opened PR for support) and django-hvad looks more easy to fix. 1.6 support fixed in django-hvad.

ATM code is django 1.4 compatible.
Django 1.6 added to build matrix to track the progress.

@meshy
Copy link
Contributor

meshy commented Aug 26, 2013

1.6 is looming. Any news?

@yakky
Copy link
Member Author

yakky commented Aug 26, 2013

Adding awesomeness to django CMS 3.0 has higher priority at the moment; django 1.6 compatibility is mostly replacing deprecated functions / features with newer version, it will be easier to fix them with a stable codebase

@meshy
Copy link
Contributor

meshy commented Aug 26, 2013

Ok, cool. Thanks for getting back to me. :)

@meshy
Copy link
Contributor

meshy commented Sep 7, 2013

Django-reversion fixes here.

@yakky
Copy link
Member Author

yakky commented Sep 7, 2013

Wow, thanks! You're really chasing after all the dependencies.

@meshy
Copy link
Contributor

meshy commented Sep 8, 2013

My pleasure, it keeps me busy ;). It's been fun so far :).

I've not had any trouble running the django-mptt tests with python 3 on django 1.6 though. Could you elaborate on the issues you were having with it?

@yakky
Copy link
Member Author

yakky commented Sep 8, 2013

Great to hear that mptt has now full support. I ran this over two months ago, they may have fixed it in the meantime.
I'll rebase this code and let it run again to catch further issues.

@meshy
Copy link
Contributor

meshy commented Sep 24, 2013

FYI: django-reversion, djangocms-text-ckeditor and django-hvad, should all have 1.6 support now but I don't think they all have releases yet.

@yakky
Copy link
Member Author

yakky commented Sep 24, 2013

Yeah, great job!
Dependency wise we should be fine.
Now it's time to get my hand dirty and deal with the last failures

@meshy
Copy link
Contributor

meshy commented Sep 24, 2013

Thank you!

@yakky
Copy link
Member Author

yakky commented Sep 27, 2013

Yeah, all green :)
@digi604 would you want to merge this now or should we wait for other code to land and rebase this when everything else is settled?

@meshy
Copy link
Contributor

meshy commented Sep 27, 2013

Good news!... hang on, one is grey.

@yakky
Copy link
Member Author

yakky commented Sep 27, 2013

it's just travis gone crazy .... I'm trying to get that instance run properly, it doesn't look as test dependent. I'll try to make it run again properly before merging

@meshy
Copy link
Contributor

meshy commented Sep 27, 2013

That one (Django 1.6, Python 3.3, mySQL) seems to fail every time, I suspect that it's something wrong with the requirements setup.

@meshy
Copy link
Contributor

meshy commented Sep 27, 2013

Is there a reason we're passing -q to pip?

@meshy
Copy link
Contributor

meshy commented Sep 27, 2013

python setup.py egg_info failed with error code 1 in /home/charlie/venvs/django-cms/build/coverage

@meshy
Copy link
Contributor

meshy commented Sep 27, 2013

Changing the required version of coverage from 3.4 to 3.6 made it work locally for me.

@meshy
Copy link
Contributor

meshy commented Sep 27, 2013

Well it looks like I made a mistake there, eh :/. I guess the coverage problem was just me -- having looked at the previous logs it got past that on travis. It's actually failing on the line:

if [ $DB == 'mysql://root@127.0.0.1/djangocms_test' ]; then pip install -q mysql-python --use-mirrors; fi

Sorry.

@meshy
Copy link
Contributor

meshy commented Sep 27, 2013

FWIW I also get an error running that line (but in fairness I don't have mysql installed). My error is

/home/charlie/venvs/django-cms/build/mysql-python/distribute-0.6.28-py3.3.egg
Traceback (most recent call last):
  File "<string>", line 16, in <module>
  File "/home/charlie/venvs/django-cms/build/mysql-python/setup.py", line 14, in <module>
    from setup_posix import get_config
  File "./setup_posix.py", line 2, in <module>
    from ConfigParser import SafeConfigParser
ImportError: No module named 'ConfigParser'
----------------------------------------
Cleaning up...
Command python setup.py egg_info failed with error code 1 in
        /home/charlie/venvs/django-cms/build/mysql-python

@meshy
Copy link
Contributor

meshy commented Sep 27, 2013

Oh dear http://stackoverflow.com/questions/14087598/python-3-3-importerror-no-module-named-configparser

Edit; summary: "MySQL-python does not currently support Python 3."

@yakky
Copy link
Member Author

yakky commented Sep 27, 2013

mysql-python doesn't support Python 3 ATM, thus is excluded from build matrix

@meshy
Copy link
Contributor

meshy commented Sep 27, 2013

Cool, well that looks like that's it for the moment, then. Good work! Good night, sleep well! ;)

@ghost ghost assigned yakky Oct 6, 2013
@craigds
Copy link
Contributor

craigds commented Nov 7, 2013

Django 1.6 has been released. Any update on when this will get merged?

@yakky
Copy link
Member Author

yakky commented Nov 8, 2013

I need some time to test this in real projects before merging.
Can't really give an ETA but I am confident to handle this in the next few days.

@yakky
Copy link
Member Author

yakky commented Nov 13, 2013

@FinalAngel due to django switch to jQuery 1.9 how we can handle the compatibility between the two?
There is some jQuery 1.9 patches around but some code in them is incompatible with older jQuery version.
Would you like me to push them in this PR so you can later fix the JS part?

@coveralls
Copy link

Coverage Status

Coverage increased (+0.06%) when pulling 4a6481e on yakky:feature/django_16 into 294fba4 on divio:develop.

@digi604
Copy link
Contributor

digi604 commented Dec 9, 2013

Is this ready?

@yakky
Copy link
Member Author

yakky commented Dec 9, 2013

Yes, anything that should arise is fixable separately

yakky added a commit that referenced this pull request Dec 9, 2013
@yakky yakky merged commit 590ff7e into django-cms:develop Dec 9, 2013
@yakky yakky deleted the feature/django_16 branch January 19, 2014 04:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants