10000 Backport 3.7.0 release to develop by FinalAngel · Pull Request #6736 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

Backport 3.7.0 release to develop #6736

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.

Sign up for GitHub

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

Merged
merged 14 commits into from
Sep 26, 2019
Merged

Backport 3.7.0 release to develop #6736

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
39964b1
Add missing parenthesis in code (#6677) (#6690)
FinalAngel Jun 25, 2019
a7571ff
Adding support for Django 2.2 LTS (#6655) (#6691)
FinalAngel Jun 25, 2019
28d4902
Fixes test suite (#6688) (#6692)
FinalAngel Jun 25, 2019
714a1df
Release 3.7.0a1 (internal) (#6693)
FinalAngel Jun 26, 2019
f6d104f
Adapt test suite for recent Travis changes (#6709) (#6710)
FinalAngel Aug 7, 2019
c6f400a
Fix content mode related to #6694 (#6696) (#6711)
FinalAngel Aug 7, 2019
537cd50
Self install doc tweaks (#6673) (#6712)
FinalAngel Aug 7, 2019
2e31084
Documenation: Add 'prepopulated_fields' to ignored options list on CM…
FinalAngel Aug 8, 2019
c3a1a73
Release 3.7.0rc1 (#6715)
FinalAngel Aug 14, 2019
918b9a3
Override urlconf_module so that Django system checks don't crash. (#…
FinalAngel Aug 27, 2019
37f3548
Release 3.7.0rc2 (#6724)
FinalAngel Aug 27, 2019
fb50e36
Updated compatibility table (#6727)
evildmp Sep 5, 2019
7bec4b5
Release 3.7.0 (#6735)
FinalAngel Sep 25, 2019
317ee96
Merge branch 'develop' into release/3.7.x
FinalAngel Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adapt test suite for recent Travis changes (#6709) (#6710) 
* test something

* further updates and add 3.7 to test

* updates

* simplify for tests

* add 3.7 support
  • Loading branch information
@FinalAngel
FinalAngel authored Aug 7, 2019
commit f6d104f0a0af25503b2bbc2914550326d0e64e16
20 changes: 5 additions & 15 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<!--
If this is a security-related patch stop immediately!

See http://docs.django-cms.org/en/latest/contributing/development-policies.html
-->

Expand All @@ -10,24 +9,15 @@
Fixes #



### Links to related discussion



### Proposed changes in this pull request


### Documentation checklist
### General checklist

* [ ] I have updated CHANGELOG.txt if appropriate
* [ ] I have updated the release notes document if appropriate, with:
* [ ] general notes
* [ ] bug-fixes
* [ ] improvements/new features
* [ ] backwards-incompatible changes
* [ ] required upgrade steps
* [ ] names of contributors
* [ ] I have updated other documentation
* [ ] I have added my name to the AUTHORS file
* [ ] This PR's documentation has been approved by Daniele Procida
* [ ] I have updated the CHANGELOG.txt
* [ ] I have created backports if necessary
* [ ] I have updated the documentation and/or amended the upgrade section
if necessary
19 changes: 18 additions & 1 deletion .travis.yml
View file
Open in desktop
FA54
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
language: python

python:
- 3.7
- 3.6
- 3.5
- 3.4
- 2.7

sudo: false

services:
- mysql
- postgresql

addons:
apt:
packages:
Expand All @@ -18,7 +23,6 @@ cache:
- node_modules
- $HOME/.pip/cache


env:
global:
# coveralls
Expand Down Expand Up @@ -69,6 +73,10 @@ matrix:
env: DJANGO=2.0 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='emailuserapp.EmailUser'
- python: 3.6
env: DJANGO=2.0 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
- python: 3.7
env: DJANGO=2.0 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
dist: xenial
sudo: true

# DJANGO 2.1
- python: 3.5
Expand All @@ -83,6 +91,10 @@ matrix:
env: DJANGO=2.1 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
- python: 3.6
env: TEST_DOCS=1 DJANGO=2.1 DATABASE_URL='sqlite://localhost/:memory:'
- python: 3.7
env: DJANGO=2.1 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
dist: xenial
sudo: true

# DJANGO 2.2
- python: 3.5
Expand All @@ -101,6 +113,10 @@ matrix:
env: TEST_DOCS=1 DJANGO=2.2 DATABASE_URL='sqlite://localhost/:memory:'
dist: xenial
sudo: true
- python: 3.7
env: DJANGO=2.2 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
dist: xenial
sudo: true
allow_failures:
- python: 2.7
env: DJANGO=1.11 DATABASE_URL='sqlite://localhost/:memory:'
Expand All @@ -109,6 +125,7 @@ matrix:
- python: 3.4
- python: 3.5
- python: 3.6
- python: 3.7
fast_finish: true

before_script:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
=== 3.7.0 (unreleased) ===

* Introduced Django 2.2 support.
* Introduced Python 3.7 support.
* Fixed test suite.


Expand Down
4 changes: 3 additions & 1 deletion docs/upgrade/3.7.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
3.7.0 release notes
###################

This release of django CMS concentrates on introducing support for Django 2.2 LTS.
This release of django CMS concentrates on introducing support for Django 2.2 LTS
and Python 3.7.


*******************
Expand All @@ -15,6 +16,7 @@ Improvements and new features
=============================

* introduced support for Django 2.2
* Introduced Python 3.7 support.
* Fixed test suite.


Expand Down
0