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

Commit

Permalink
Added support for Django 2.0 and py3.6 (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
jarshwah committed Feb 18, 2017
1 parent fd800df commit d3f0aa4
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 21 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2.0.0 - February 16, 2016
=========================

Compatibility updates for Django 2.0

- Added python 3.6
- Updated Vagrant version to 1.9.1 (Readme)
- Updated VirtualBox version to 5.1.14 (Readme)
- Pinned tox to 2.3 due to removal of PYTHONPATH support (https://github.com/tox-dev/tox/issues/457)

1.11.2 - September 20, 2016
===========================

Expand Down
30 changes: 20 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Preparation
### Software installation

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

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

(vm) $ runtests27-mysql
(vm) $ runtests36-mysql
(vm) $ runtests34-sqlite3-gis gis_tests
(vm) $ runtests35-postgres admin_widgets --selenium chrome

Supported commands
------------------

```
runtests27-mysql runtests27-sqlite3-gis runtests34-sqlite3 runtests35-postgres-gis runtests-isort
runtests27-mysql-gis runtests34-mysql runtests34-sqlite3-gis runtests35-sqlite3
runtests27-postgres runtests34-mysql-gis runtests35-mysql runtests35-sqlite3-gis
runtests27-postgres-gis runtests34-postgres runtests35-mysql-gis runtests-docs
runtests27-sqlite3 runtests34-postgres-gis runtests35-postgres runtests-flake8
runtests-isort runtests27-sqlite3 runtests34-sqlite3
runtests-flake8 runtests27-sqlite3-gis runtests34-sqlite3-gis
runtests-docs runtests27-mysql runtests34-mysql
runtests27-mysql-gis runtests34-mysql-gis
runtests27-postgres runtests34-postgres
runtests27-postgres-gis runtests34-postgres-gis
runtests35-sqlite3 runtests36-sqlite3
runtests35-sqlite3-gis runtests36-sqlite3-gis
runtests35-mysql runtests36-mysql
runtests35-mysql-gis runtests36-mysql-gis
runtests35-postgres runtests36-postgres
runtests35-postgres-gis runtests36-postgres-gis
```

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

# Run selenium tests against chrome driver (no firefox available yet)
runtests27-sqlite3 admin_widgets --selenium chrome
runtests36-sqlite3 admin_widgets --selenium chrome --parallel 1
```


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

(vm) $ runtests27-sqlite3 admin_widgets --selenium chrome
(vm) $ runtests36-sqlite3 admin_widgets --selenium chrome --parallel 1

The test suite will sometimes hang when running selenium tests in parallel mode.

Building the documentation
--------------------------
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# vi: set ft=ruby :

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

Expand Down
17 changes: 8 additions & 9 deletions box-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@
set -x # To output the commands as they are run.
date -Is

runtests27-sqlite3-gis gis_tests
runtests27-postgres-gis gis_tests
runtests27-mysql-gis gis_tests
runtests27-sqlite3 auth_tests
runtests27-postgres auth_tests
runtests27-mysql auth_tests

runtests34-sqlite3-gis gis_tests
runtests34-postgres-gis gis_tests
runtests34-mysql-gis gis_tests
Expand All @@ -28,11 +21,17 @@ runtests35-sqlite3 auth_tests
runtests35-postgres auth_tests
runtests35-mysql auth_tests

runtests27-sqlite3 admin_widgets --selenium chrome
runtests36-sqlite3-gis gis_tests
runtests36-postgres-gis gis_tests
runtests36-mysql-gis gis_tests
runtests36-sqlite3 auth_tests
runtests36-postgres auth_tests
runtests36-mysql auth_tests

runtests36-sqlite3 admin_widgets --selenium chrome --parallel 1
runtests-flake8
runtests-docs
runtests-isort
runtests-javascript

date -Is
set +x
2 changes: 1 addition & 1 deletion roles/python/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
- libmemcached-dev # for pylibmc

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

- name: install sphinx for building docs
Expand Down
1 change: 1 addition & 0 deletions roles/python/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ python_versions:
- 2.7
- 3.4
- 3.5
- 3.6

databases:
- mysql
Expand Down

0 comments on commit d3f0aa4

Please sign in to comment.