Skip to content
This repository was archived by the owner on Oct 8, 2019. It is now read-only.

Commit d3f0aa4

Browse files
authored
Added support for Django 2.0 and py3.6 (#26)
1 parent fd800df commit d3f0aa4

File tree

6 files changed

+41
-21
lines changed

6 files changed

+41
-21
lines changed

CHANGELOG

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2.0.0 - February 16, 2016
2+
=========================
3+
4+
Compatibility updates for Django 2.0
5+
6+
- Added python 3.6
7+
- Updated Vagrant version to 1.9.1 (Readme)
8+
- Updated VirtualBox version to 5.1.14 (Readme)
9+
- Pinned tox to 2.3 due to removal of PYTHONPATH support (https://github.com/tox-dev/tox/issues/457)
10+
111
1.11.2 - September 20, 2016
212
===========================
313

README.md

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Preparation
2121
### Software installation
2222

2323
First of all, you need to install the latest versions of
24-
[Vagrant 1.8.5](https://www.vagrantup.com/downloads.html) and
25-
[VirtualBox 5.1.6](https://www.virtualbox.org/wiki/Downloads) on your host
24+
[Vagrant 1.9.1](https://www.vagrantup.com/downloads.html) and
25+
[VirtualBox 5.1.14](https://www.virtualbox.org/wiki/Downloads) on your host
2626
machine.
2727

2828
If you use a version of VirtualBox that isn't 5.1.6 you may run into problems
@@ -94,19 +94,27 @@ Once the VM is up and running, type the following command to SSH into the VM
9494
Once inside the VM, you can run the tests by typing any of the pre-defined
9595
aliases. For example:
9696

97-
(vm) $ runtests27-mysql
97+
(vm) $ runtests36-mysql
9898
(vm) $ runtests34-sqlite3-gis gis_tests
9999
(vm) $ runtests35-postgres admin_widgets --selenium chrome
100100

101101
Supported commands
102102
------------------
103103

104104
```
105-
runtests27-mysql runtests27-sqlite3-gis runtests34-sqlite3 runtests35-postgres-gis runtests-isort
106-
runtests27-mysql-gis runtests34-mysql runtests34-sqlite3-gis runtests35-sqlite3
107-
runtests27-postgres runtests34-mysql-gis runtests35-mysql runtests35-sqlite3-gis
108-
runtests27-postgres-gis runtests34-postgres runtests35-mysql-gis runtests-docs
109-
runtests27-sqlite3 runtests34-postgres-gis runtests35-postgres runtests-flake8
105+
runtests-isort runtests27-sqlite3 runtests34-sqlite3
106+
runtests-flake8 runtests27-sqlite3-gis runtests34-sqlite3-gis
107+
runtests-docs runtests27-mysql runtests34-mysql
108+
runtests27-mysql-gis runtests34-mysql-gis
109+
runtests27-postgres runtests34-postgres
110+
runtests27-postgres-gis runtests34-postgres-gis
111+
112+
runtests35-sqlite3 runtests36-sqlite3
113+
runtests35-sqlite3-gis runtests36-sqlite3-gis
114+
runtests35-mysql runtests36-mysql
115+
runtests35-mysql-gis runtests36-mysql-gis
116+
runtests35-postgres runtests36-postgres
117+
runtests35-postgres-gis runtests36-postgres-gis
110118
```
111119

112120
Examples
@@ -125,7 +133,7 @@ runtests35-postgres --keepdb -v 2 queries expressions lookup aggregation annotat
125133
runtests35-postgres-gis gis_tests
126134

127135
# Run selenium tests against chrome driver (no firefox available yet)
128-
runtests27-sqlite3 admin_widgets --selenium chrome
136+
runtests36-sqlite3 admin_widgets --selenium chrome --parallel 1
129137
```
130138

131139

@@ -145,7 +153,9 @@ Chrome is pre-installed so that Django's selenium tests can be run in headless
145153
mode with a virtual display (id `:99`). For example, you may run a specific test
146154
like so:
147155

148-
(vm) $ runtests27-sqlite3 admin_widgets --selenium chrome
156+
(vm) $ runtests36-sqlite3 admin_widgets --selenium chrome --parallel 1
157+
158+
The test suite will sometimes hang when running selenium tests in parallel mode.
149159

150160
Building the documentation
151161
--------------------------

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# vi: set ft=ruby :
33

44
Vagrant.configure("2") do |config|
5-
config.vm.box = "djangoproject/django-box-1.11"
5+
config.vm.box = "djangoproject/django-box-2.0"
66
config.vm.host_name = "djangobox"
77
config.ssh.forward_agent = true
88

box-tests.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77
set -x # To output the commands as they are run.
88
date -Is
99

10-
runtests27-sqlite3-gis gis_tests
11-
runtests27-postgres-gis gis_tests
12-
runtests27-mysql-gis gis_tests
13-
runtests27-sqlite3 auth_tests
14-
runtests27-postgres auth_tests
15-
runtests27-mysql auth_tests
16-
1710
runtests34-sqlite3-gis gis_tests
1811
runtests34-postgres-gis gis_tests
1912
runtests34-mysql-gis gis_tests
@@ -28,11 +21,17 @@ runtests35-sqlite3 auth_tests
2821
runtests35-postgres auth_tests
2922
runtests35-mysql auth_tests
3023

31-
runtests27-sqlite3 admin_widgets --selenium chrome
24+
runtests36-sqlite3-gis gis_tests
25+
runtests36-postgres-gis gis_tests
26+
runtests36-mysql-gis gis_tests
27+
runtests36-sqlite3 auth_tests
28+
runtests36-postgres auth_tests
29+
runtests36-mysql auth_tests
30+
31+
runtests36-sqlite3 admin_widgets --selenium chrome --parallel 1
3232
runtests-flake8
3333
runtests-docs
3434
runtests-isort
35-
runtests-javascript
3635

3736
date -Is
3837
set +x

roles/python/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
- libmemcached-dev # for pylibmc
4242

4343
- name: install tox for running build tasks
44-
pip: name=tox executable=pip3
44+
pip: name=tox==2.3.0 executable=pip3 # 2.4 -> 2.6 disabled PYTHONPATH support
4545
become: yes
4646

4747
- name: install sphinx for building docs

roles/python/vars/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ python_versions:
22
- 2.7
33
- 3.4
44
- 3.5
5+
- 3.6
56

67
databases:
78
- mysql

0 commit comments

Comments
 (0)