8000 Adapt test suite for recent Travis changes (#6709) · django-cms/django-cms@06e958a · GitHub
[go: up one dir, main page]
Skip to content

Commit 06e958a

Browse files
FinalAngelFinalAngel
committed
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
1 parent 714a1df commit 06e958a

File tree

4 files changed

+27
-17
lines changed

4 files changed

+27
-17
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!--
22
If this is a security-related patch stop immediately!
3-
43
See http://docs.django-cms.org/en/latest/contributing/development-policies.html
54
-->
65

@@ -10,24 +9,15 @@
109
Fixes #
1110

1211

13-
1412
### Links to related discussion
1513

1614

17-
1815
### Proposed changes in this pull request
1916

2017

21-
### Documentation checklist
18+
### General checklist
2219

23-
* [ ] I have updated CHANGELOG.txt if appropriate
24-
* [ ] I have updated the release notes document if appropriate, with:
25-
* [ ] general notes
26-
* [ ] bug-fixes
27-
* [ ] improvements/new features
28-
* [ ] backwards-incompatible changes
29-
* [ ] required upgrade steps
30-
* [ ] names of contributors
31-
* [ ] I have updated other documentation
32-
* [ ] I have added my name to the AUTHORS file
33-
* [ ] This PR's documentation has been approved by Daniele Procida
20+
* [ ] I have updated the CHANGELOG.txt
21+
* [ ] I have created backports if necessary
22+
* [ ] I have updated the documentation and/or amended the upgrade section
23+
if necessary

‎.travis.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
language: python
22

33
python:
4+
- 3.7
45
- 3.6
56
- 3.5
67
- 3.4
78
- 2.7
89

910
sudo: false
1011

12+
services:
13+
- mysql
14+
- postgresql
15+
1116
addons:
1217
apt:
1318
packages:
@@ -18,7 +23,6 @@ cache:
1823
- node_modules
1924
- $HOME/.pip/cache
2025

21-
2226
env:
2327
global:
2428
# coveralls
@@ -69,6 +73,10 @@ matrix:
6973
env: DJANGO=2.0 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='emailuserapp.EmailUser'
7074
- python: 3.6
7175
env: DJANGO=2.0 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
76+
- python: 3.7
77+
env: DJANGO=2.0 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
78+
dist: xenial
79+
sudo: true
7280

7381
# DJANGO 2.1
7482
- python: 3.5
@@ -83,6 +91,10 @@ matrix:
8391
env: DJANGO=2.1 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
8492
- python: 3.6
8593
env: TEST_DOCS=1 DJANGO=2.1 DATABASE_URL='sqlite://localhost/:memory:'
94+
- python: 3.7
95+
env: DJANGO=2.1 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
96+
dist: xenial
97+
sudo: true
8698

8799
# DJANGO 2.2
88100
- python: 3.5
@@ -101,6 +113,10 @@ matrix:
101113
env: TEST_DOCS=1 DJANGO=2.2 DATABASE_URL='sqlite://localhost/:memory:'
102114
dist: xenial
103115
sudo: true
116+
- python: 3.7
117+
env: DJANGO=2.2 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' AUTH_USER_MODEL='customuserapp.User'
118+
dist: xenial
119+
sudo: true
104120
allow_failures:
105121
- python: 2.7
106122
env: DJANGO=1.11 DATABASE_URL='sqlite://localhost/:memory:'
@@ -109,6 +125,7 @@ matrix:
109125
- python: 3.4
110126
- python: 3.5
111127
- python: 3.6
128+
- python: 3.7
112129
fast_finish: true
113130

114131
before_script:

‎CHANGELOG.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
=== 3.7.0 (unreleased) ===
22

33
* Introduced Django 2.2 support.
4+
* Introduced Python 3.7 support.
45
* Fixed test suite.
56

67

‎docs/upgrade/3.7.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
3.7.0 release notes
55
###################
66

7-
This release of django CMS concentrates on introducing support for Django 2.2 LTS.
7+
This release of django CMS concentrates on introducing support for Django 2.2 LTS
8+
and Python 3.7.
89

910

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

1718
* introduced support for Django 2.2
19+
* Introduced Python 3.7 support.
1820
* Fixed test suite.
1921

2022

0 commit comments

Comments
 (0)
0