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

Adding support for Django 2.2 LTS to django-cms 4.0 #6790

Merged
merged 2 commits into from
Feb 4, 2020

Conversation

jonathan-s
Copy link
Contributor

@jonathan-s jonathan-s commented Jan 8, 2020

Description

Cherrypicks the work from develop that makes this compatible with django 2.2. The tests are currently failing because PyYaml does not support python 3.4. Furthermore python 3.4 is end of life as of March 2019 ( last year ). So I would suggest that python 3.4 is also removed from travis. Life would be simpler and everyone happier.

@FinalAngel Could you please have a look at this too?

Checklist

  • I have opened this pull request against release/4.0.x
  • I have updated the CHANGELOG.rst
  • I have added or modified the tests when changing logic

@coveralls
Copy link

coveralls commented Jan 8, 2020

Coverage Status

Coverage remained the same at 77.668% when pulling f5b542c on jonathan-s:django-2.2 into d7b3f58 on divio:release/4.0.x.

@jonathan-s jonathan-s force-pushed the django-2.2 branch 2 times, most recently from c476bd2 to 3d8dcd1 Compare January 8, 2020 14:09
CHANGELOG.txt Show resolved Hide resolved
docs/upgrade/3.7.rst Outdated Show resolved Hide resolved
* Fix typo

* Fixed issue with force_color

* Removed unused import

* Added docs to index.rst

* Fixed travis jobs

* Changes after review

* Fixed django version in setup

* Update django-2.2.txt
Copy link
Contributor

@Aiky30 Aiky30 left a comment

Choose a reason for hiding this comment

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

All looks ok although I'm thinking that we should also add Python 3.7 and maybe 3.8 support to the ci test list. @FinalAngel What are your thoughts on this and where is the CMS 3.7 / 3.8 aiming to support?

@evildmp evildmp merged commit 1b80000 into django-cms:release/4.0.x Feb 4, 2020
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.

5 participants