Skip to content
Permalink
Browse files

Adapt test suite for recent Travis changes (#6709)

* test something

* further updates and add 3.7 to test

* updates

* simplify for tests

* add 3.7 support
  • Loading branch information...
FinalAngel committed Aug 6, 2019
1 parent 006367b commit 69d48bfbec8b9ce1d6bea8ca20225fa38b19baf5
Showing with 27 additions and 17 deletions.
  1. +5 −15 .github/PULL_REQUEST_TEMPLATE.md
  2. +18 −1 .travis.yml
  3. +1 −0 CHANGELOG.txt
  4. +3 −1 docs/upgrade/3.7.rst
@@ -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
-->

@@ -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
@@ -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:
@@ -18,7 +23,6 @@ cache:
- node_modules
- $HOME/.pip/cache


env:
global:
# coveralls
@@ -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
@@ -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
@@ -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:'
@@ -109,6 +125,7 @@ matrix:
- python: 3.4
- python: 3.5
- python: 3.6
- python: 3.7
fast_finish: true

before_script:
@@ -1,6 +1,7 @@
=== 3.7.0 (unreleased) ===

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


@@ -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.


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

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


0 comments on commit 69d48bf

Please sign in to comment.
You can’t perform that action at this time.