Fixed conflicts with versions

Author: jarshwah

README.md

@@ -105,21 +105,27 @@ Once inside the VM, you can run the tests by typing any of the pre-defined
 aliases. For example:
 
     (vm) $ runtests36-mysql
-    (vm) $ runtests35-sqlite3-gis gis_tests
+    (vm) $ runtests35-spatialite gis_tests
     (vm) $ runtests35-postgres admin_widgets --selenium chrome
 
 Supported commands
 ------------------
 
 ```
 runtests-isort    runtests35-sqlite3        runtests36-sqlite3
-runtests-flake8   runtests35-sqlite3-gis    runtests36-sqlite3-gis
+runtests-flake8   runtests35-spatialite     runtests36-spatialite
 runtests-docs     runtests35-mysql          runtests36-mysql
-                  runtests35-mysql-gis      runtests36-mysql-gis
+                  runtests35-mysql_gis      runtests36-mysql_gis
                   runtests35-postgres       runtests36-postgres
-                  runtests35-postgres-gis   runtests36-postgres-gis
+                  runtests35-postgis        runtests36-postgis
 ```
 
+Some of these names have changed in version 2.1 of django-box. Now they
+mirror the naming convention used in our Jenkins CI setup. i.e.
+`runtests3x-sqlite3-gis` is now `runtests3x-spatialite`,
+`runtest3x-postgres-gis` is now `runtests3x-postgis` and
+`runtest3x-mysql-gis` is now `runtests3x-mysql_gis`.
+
 Examples
 --------
 
@@ -133,7 +139,7 @@ testing performance, and target specific test modules.
 runtests35-postgres --keepdb -v 2 queries expressions lookup aggregation annotations
 
 # Run GIS tests
-runtests35-postgres-gis gis_tests
+runtests35-postgis gis_tests
 
 # Run selenium tests against chrome driver (no firefox available yet)
 runtests36-sqlite3 admin_widgets --selenium chrome --parallel 1

box-tests.sh

@@ -7,23 +7,23 @@
 set -x  # To output the commands as they are run.
 date -Is
 
-runtests34-sqlite3-gis gis_tests
-runtests34-postgres-gis gis_tests
-runtests34-mysql-gis gis_tests
+runtests34-spatialite gis_tests
+runtests34-postgis gis_tests
+runtests34-mysql_gis gis_tests
 runtests34-sqlite3 auth_tests
 runtests34-postgres auth_tests
 runtests34-mysql auth_tests
 
-runtests35-sqlite3-gis gis_tests
-runtests35-postgres-gis gis_tests
-runtests35-mysql-gis gis_tests
+runtests35-spatialite gis_tests
+runtests35-postgis gis_tests
+runtests35-mysql_gis gis_tests
 runtests35-sqlite3 auth_tests
 runtests35-postgres auth_tests
 runtests35-mysql auth_tests
 
-runtests36-sqlite3-gis gis_tests
-runtests36-postgres-gis gis_tests
-runtests36-mysql-gis gis_tests
+runtests36-spatialite gis_tests
+runtests36-postgis gis_tests
+runtests36-mysql_gis gis_tests
 runtests36-sqlite3 auth_tests
 runtests36-postgres auth_tests
 runtests36-mysql auth_tests

roles/djangodata/files/test_postgres_gis.py renamed to roles/djangodata/files/test_postgis.py

@@ -48,27 +48,16 @@
   pip: name=Sphinx executable=pip3
   become: yes
 
-- name: create aliases for executing tests on regular database backends
+- name: create aliases for executing tests on regular and GIS database backends
   lineinfile:
     dest: "{{ user_home}}.profile"
     line: >
-        alias runtests{{ (10 * item.0)|round|int }}-{{ item.1 }}='PYTHONPATH=/home/vagrant/djangodata/
-        tox -c /django/tox.ini -e py{{ (10 * item.0)|round|int }}{{ ("-" + item.1)|replace("-sqlite3", "") }} --
-        --settings=test_{{ item.1 }}'
+        alias runtests{{ item.0|replace('.', '') }}-{{ item.1["jenkins_runner"] }}='PYTHONPATH=/home/vagrant/djangodata/
+        tox -c /django/tox.ini -e py{{ item.0|replace(".", "") }}{{ item.1["tox_env_factor"] }} --
+        --settings=test_{{ item.1["jenkins_runner"] }}'
   with_nested:
     - '{{ python_versions }}'
-    - '{{ databases }}'
-
-- name: create aliases for executing tests on GIS database backends
-  lineinfile:
-    dest: "{{ user_home}}.profile"
-    line: >
-        alias runtests{{ (10 * item.0)|round|int }}-{{ item.1 }}-gis='PYTHONPATH=/home/vagrant/djangodata/
-        tox -c /django/tox.ini -e py{{ (10 * item.0)|round|int }}{{ ("-" + item.1)|replace("-sqlite3", "") }} --
-        --settings=test_{{ item.1 }}_gis'
-  with_nested:
-    - '{{ python_versions }}'
-    - '{{ databases }}'
+    - '{{ database_config }}'
 
 - name: create aliases for non database tests
   lineinfile:

roles/djangodata/files/test_sqlite3_gis.py renamed to roles/djangodata/files/test_spatialite.py

@@ -3,7 +3,10 @@ python_versions:
   - 3.5
   - 3.6
 
-databases:
-  - mysql
-  - postgres
-  - sqlite3
+database_config:
+  - { jenkins_runner: 'mysql', tox_env_factor: '-mysql' }
+  - { jenkins_runner: 'mysql_gis', tox_env_factor: '-mysql' }
+  - { jenkins_runner: 'postgres', tox_env_factor: '-postgres' }
+  - { jenkins_runner: 'postgis',  tox_env_factor: '-postgres' }
+  - { jenkins_runner: 'sqlite3', tox_env_factor: '' }
+  - { jenkins_runner: 'spatialite', tox_env_factor: '' }