Merge lp:~phanatic/django-configglue/django-all-releases into lp:django-configglue

Proposed by Szilveszter Farkas
Status: Needs review
Proposed branch: lp:~phanatic/django-configglue/django-all-releases
Merge into: lp:django-configglue
Diff against target: 77 lines (+24/-3)
2 files modified
django_configglue/schema.py (+13/-0)
tox.ini (+11/-3)
To merge this branch: bzr merge lp:~phanatic/django-configglue/django-all-releases
Reviewer Review Type Date Requested Status
Ricardo Kirkner Pending
Review via email: mp+198468@code.launchpad.net

Commit message

Support all Django releases ever between 1.3 and 1.6

Description of the change

This branch makes sure all Django releases between 1.3 and 1.6 have a schema registered (so that the default strict=True mode works with any release).

I'd really appreciate a point release for django-configglue if you accept this merge proposal.

To post a comment you must log in.

Unmerged revisions

80. By Szilveszter Farkas

Support all Django releases ever between 1.3 and 1.6

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'django_configglue/schema.py'
--- django_configglue/schema.py 2013-11-07 17:56:05 +0000
+++ django_configglue/schema.py 2013-12-10 22:26:12 +0000
@@ -1850,15 +1850,28 @@
1850schemas = DjangoSchemaFactory()1850schemas = DjangoSchemaFactory()
1851schemas.register(BaseDjangoSchema)1851schemas.register(BaseDjangoSchema)
1852schemas.register(Django13Schema)1852schemas.register(Django13Schema)
1853schemas.register(Django13Schema, '1.3.1')
1854schemas.register(Django13Schema, '1.3.2')
1855schemas.register(Django13Schema, '1.3.3')
1856schemas.register(Django13Schema, '1.3.4')
1857schemas.register(Django13Schema, '1.3.5')
1853schemas.register(Django136Schema)1858schemas.register(Django136Schema)
1854schemas.register(Django136Schema, '1.3.7')1859schemas.register(Django136Schema, '1.3.7')
1855schemas.register(Django14Schema)1860schemas.register(Django14Schema)
1861schemas.register(Django14Schema, '1.4.1')
1862schemas.register(Django14Schema, '1.4.2')
1863schemas.register(Django14Schema, '1.4.3')
1856schemas.register(Django144Schema)1864schemas.register(Django144Schema)
1857schemas.register(Django145Schema)1865schemas.register(Django145Schema)
1866schemas.register(Django145Schema, '1.4.6')
1867schemas.register(Django145Schema, '1.4.7')
1858schemas.register(Django145Schema, '1.4.8')1868schemas.register(Django145Schema, '1.4.8')
1869schemas.register(Django145Schema, '1.4.9')
1870schemas.register(Django145Schema, '1.4.10')
1859schemas.register(Django15Schema)1871schemas.register(Django15Schema)
1860schemas.register(Django15Schema, '1.5.1')1872schemas.register(Django15Schema, '1.5.1')
1861schemas.register(Django15Schema, '1.5.2')1873schemas.register(Django15Schema, '1.5.2')
1862schemas.register(Django153Schema)1874schemas.register(Django153Schema)
1863schemas.register(Django153Schema, '1.5.4')1875schemas.register(Django153Schema, '1.5.4')
1876schemas.register(Django153Schema, '1.5.5')
1864schemas.register(Django16Schema)1877schemas.register(Django16Schema)
18651878
=== modified file 'tox.ini'
--- tox.ini 2013-11-07 01:08:39 +0000
+++ tox.ini 2013-12-10 22:26:12 +0000
@@ -5,9 +5,10 @@
5 py26-django145,5 py26-django145,
6 py27-django137,6 py27-django137,
7 py27-django145,7 py27-django145,
8 py27-django1410,
8 py26-django15,9 py26-django15,
9 py27-django15,10 py27-django15,
10 py27-django154,11 py27-django155,
11 py27-django16,12 py27-django16,
12 edge13 edge
1314
@@ -49,6 +50,13 @@
49 mock50 mock
50 django==1.4.551 django==1.4.5
5152
53[testenv:py27-django1410]
54basepython = python2.7
55deps =
56 configglue
57 mock
58 django==1.4.10
59
52[testenv:py26-django15]60[testenv:py26-django15]
53basepython = python2.661basepython = python2.6
54deps =62deps =
@@ -63,12 +71,12 @@
63 mock71 mock
64 django==1.572 django==1.5
6573
66[testenv:py27-django154]74[testenv:py27-django155]
67basepython = python2.775basepython = python2.7
68deps =76deps =
69 configglue77 configglue
70 mock78 mock
71 django==1.5.479 django==1.5.5
7280
73[testenv:py27-django16]81[testenv:py27-django16]
74basepython = python2.782basepython = python2.7

Subscribers

People subscribed via source and target branches