django-configglue

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

  1. django-all-releases
  2. Merge into trunk
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
1=== modified file 'django_configglue/schema.py'
2--- django_configglue/schema.py 2013-11-07 17:56:05 +0000
3+++ django_configglue/schema.py 2013-12-10 22:26:12 +0000
4@@ -1850,15 +1850,28 @@
5 schemas = DjangoSchemaFactory()
6 schemas.register(BaseDjangoSchema)
7 schemas.register(Django13Schema)
8+schemas.register(Django13Schema, '1.3.1')
9+schemas.register(Django13Schema, '1.3.2')
10+schemas.register(Django13Schema, '1.3.3')
11+schemas.register(Django13Schema, '1.3.4')
12+schemas.register(Django13Schema, '1.3.5')
13 schemas.register(Django136Schema)
14 schemas.register(Django136Schema, '1.3.7')
15 schemas.register(Django14Schema)
16+schemas.register(Django14Schema, '1.4.1')
17+schemas.register(Django14Schema, '1.4.2')
18+schemas.register(Django14Schema, '1.4.3')
19 schemas.register(Django144Schema)
20 schemas.register(Django145Schema)
21+schemas.register(Django145Schema, '1.4.6')
22+schemas.register(Django145Schema, '1.4.7')
23 schemas.register(Django145Schema, '1.4.8')
24+schemas.register(Django145Schema, '1.4.9')
25+schemas.register(Django145Schema, '1.4.10')
26 schemas.register(Django15Schema)
27 schemas.register(Django15Schema, '1.5.1')
28 schemas.register(Django15Schema, '1.5.2')
29 schemas.register(Django153Schema)
30 schemas.register(Django153Schema, '1.5.4')
31+schemas.register(Django153Schema, '1.5.5')
32 schemas.register(Django16Schema)
33
34=== modified file 'tox.ini'
35--- tox.ini 2013-11-07 01:08:39 +0000
36+++ tox.ini 2013-12-10 22:26:12 +0000
37@@ -5,9 +5,10 @@
38 py26-django145,
39 py27-django137,
40 py27-django145,
41+ py27-django1410,
42 py26-django15,
43 py27-django15,
44- py27-django154,
45+ py27-django155,
46 py27-django16,
47 edge
48
49@@ -49,6 +50,13 @@
50 mock
51 django==1.4.5
52
53+[testenv:py27-django1410]
54+basepython = python2.7
55+deps =
56+ configglue
57+ mock
58+ django==1.4.10
59+
60 [testenv:py26-django15]
61 basepython = python2.6
62 deps =
63@@ -63,12 +71,12 @@
64 mock
65 django==1.5
66
67-[testenv:py27-django154]
68+[testenv:py27-django155]
69 basepython = python2.7
70 deps =
71 configglue
72 mock
73- django==1.5.4
74+ django==1.5.5
75
76 [testenv:py27-django16]
77 basepython = python2.7

Subscribers

People subscribed via source and target branches