Skip to content

Commit

Permalink
Update test settings.
Browse files Browse the repository at this point in the history
  • Loading branch information
philippbosch committed Jul 29, 2014
1 parent bc1746d commit db292c0
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 22 deletions.
1 change: 0 additions & 1 deletion geoposition/tests/test_geoposition.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,4 @@ def test_inequality_with_none(self):
def test_db_value_to_python_object(self):
obj = PointOfInterest.objects.create(name='Foo', address='some where', city='city', zipcode='12345', position=Geoposition(52.5,13.4))
poi = PointOfInterest.objects.get(id=obj.id)
self.assertIsInstance(obj.position, Geoposition)
self.assertIsInstance(poi.position, Geoposition)
61 changes: 40 additions & 21 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,77 +3,96 @@
# Then call "tox" from this directory to run the test suite for all configurations.

[tox]
envlist = py2.6_django1.4.10,
envlist = py2.6_django1.4.13,
py2.6_django1.5,
py2.6_django1.5.5,
py2.6_django1.5.8,
py2.6_django1.6,
py2.6_django1.6.1,
py2.7_django1.4.10,
py2.6_django1.6.5,
py2.7_django1.4.13,
py2.7_django1.5,
py2.7_django1.5.5,
py2.7_django1.5.8,
py2.7_django1.6,
py2.7_django1.6.1,
py2.7_django1.6.5,
py3.3_django1.5,
py3.3_django1.5.5,
py3.3_django1.5.8,
py3.3_django1.6,
py3.3_django1.6.1
py3.3_django1.6.5,
py3.4_django1.5,
py3.4_django1.5.8,
py3.4_django1.6,
py3.4_django1.6.5

[testenv]
commands = {envpython} manage.py test geoposition

[testenv:py2.6_django1.4.10]
[testenv:py2.6_django1.4.13]
basepython = python2.6
deps = Django==1.4.10
deps = Django==1.4.13

[testenv:py2.6_django1.5]
basepython = python2.6
deps = Django==1.5

[testenv:py2.6_django1.5.5]
[testenv:py2.6_django1.5.8]
basepython = python2.6
deps = Django==1.5.5
deps = Django==1.5.8

[testenv:py2.6_django1.6]
basepython = python2.6
deps = Django==1.6

[testenv:py2.6_django1.6.1]
basepython = python2.6
deps = Django==1.6.1
deps = Django==1.6.5

[testenv:py2.7_django1.4.10]
[testenv:py2.7_django1.4.13]
basepython = python2.7
deps = Django==1.4.10
deps = Django==1.4.13

[testenv:py2.7_django1.5]
basepython = python2.7
deps = Django==1.5

[testenv:py2.7_django1.5.5]
[testenv:py2.7_django1.5.8]
basepython = python2.7
deps = Django==1.5.5
deps = Django==1.5.8

[testenv:py2.7_django1.6]
basepython = python2.7
deps = Django==1.6

[testenv:py2.7_django1.6.1]
basepython = python2.7
deps = Django==1.6.1
deps = Django==1.6.5

[testenv:py3.3_django1.5]
basepython = python3.3
deps = Django==1.5

[testenv:py3.3_django1.5.5]
[testenv:py3.3_django1.5.8]
basepython = python3.3
deps = Django==1.5.5
deps = Django==1.5.8

[testenv:py3.3_django1.6]
basepython = python3.3
deps = Django==1.6

[testenv:py3.3_django1.6.1]
basepython = python3.3
deps = Django==1.6.1
deps = Django==1.6.5

[testenv:py3.4_django1.5]
basepython = python3.4
deps = Django==1.5

[testenv:py3.4_django1.5.8]
basepython = python3.4
deps = Django==1.5.8

[testenv:py3.4_django1.6]
basepython = python3.4
deps = Django==1.6

[testenv:py3.4_django1.6.1]
basepython = python3.4
deps = Django==1.6.5

0 comments on commit db292c0

Please sign in to comment.