APD-246 - [BE] migrate project to work under Django master branch #13

poxip · 2017-02-09T11:23:08Z

This also provides backwards compatibility with Django 1.8, 1.9, 1.10, 1.11a1

coveralls · 2017-02-09T11:29:46Z

Coverage increased (+0.8%) to 47.554% when pulling d215f7f on feature/APD-246-migrate-to-django-master into 4c77aea on master.

coveralls · 2017-02-09T12:17:32Z

Coverage increased (+0.8%) to 47.554% when pulling 3c0f780 on feature/APD-246-migrate-to-django-master into 4c77aea on master.

coveralls · 2017-02-09T12:31:53Z

Coverage increased (+0.8%) to 47.554% when pulling 3c0f780 on feature/APD-246-migrate-to-django-master into 4c77aea on master.

jacoor · 2017-02-20T12:47:33Z

ydcommon/views.py

@@ -2,7 +2,11 @@
 from django.views.generic import TemplateView
 from django.conf import settings
 from django.contrib.admin.views.decorators import staff_member_required
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse


Recall my comment in Demo project? This one should be done as file and imported from there, even in demo.

remik · 2017-02-20T14:44:17Z

requirements.txt

@@ -1,3 +1,2 @@
-Django>=1.8.7, <1.9 # rq.filter: >=1.8.7,< 1.9


No Django at all?

Good one. Probably pip complains.

Yes, this is because pip complains while running tests under tox.

remik · 2017-02-20T14:45:24Z

test_project/urls.py

-                           'ydcommon.views.qunit_view',
-                           name='qunit'),
-                       )
+urlpatterns = [


Not related to PR but @jacoor are we using it all? Maybe time for cleanup.

Until we decide to use some FE CMS this has to stay.

remik · 2017-02-20T14:46:38Z

tox.ini

-    py34-django18,
-    py35-django18,
-    py36-django18,
+    {py27,py34,py35}-django18


Merge all (py 27-35) to 1 line.
py36 separate.

remik · 2017-02-20T14:47:00Z

tox.ini

+    py34: python3.4
+    py35: python3.5
+    py36: python3.6
+    py27: python2.7


Can you sort it?

remik · 2017-02-20T14:47:46Z

tox.ini

+    {py27,py34,py35}-django19
+    {py27,py34,py35,py36}-django110
+    # add django1.11 after release
+    {py34,py35,py36}-django{master}

 [testenv]


Add option for master to allow fail.

remik · 2017-02-20T14:48:38Z

ydcommon/management/commands/check_migrations.py

-                    dest='xml_output',
-                    help='Render as XML'),
-    )
+class Command(BaseCommand):


Did you test it? This command is not working since Django 1.8.

fixed by @poxip

remik · 2017-02-20T14:49:15Z

ydcommon/management/commands/jshint.py

@@ -1,7 +1,6 @@
 import sys


@jacoor do we use it at all?

Until we decide to use some FE CMS this has to stay.

remik · 2017-02-20T14:49:35Z

ydcommon/management/commands/run_qunit.py

@@ -3,11 +3,10 @@
 import re


@jacoor do we use it at all?

Until we decide to use some FE CMS this has to stay.

remik · 2017-02-20T14:51:02Z

ydcommon/views.py

@@ -13,7 +17,7 @@ class QunitTestsView(TemplateView):
    def get_context_data(self, **kwargs):
        context = super(QunitTestsView, self).get_context_data(**kwargs)
        if not kwargs['path'] or kwargs['path'] == 'index':
-            for template_dir in settings.TEMPLATE_DIRS:
+            for template_dir in settings.TEMPLATES[0]['DIRS']:


We need to check both versions.

remik · 2017-02-20T14:53:02Z

.travis.yml

@@ -7,6 +7,8 @@ python:

 env:
  - DJANGO="django>=1.8,<1.9"
+  - DJANGO="django>=1.9,<1.10"
+  - DJANGO="django>=1.10,<1.11"


Missing master version.
Maybe convert it to tox-travis version eg. https://github.com/ArabellaTech/drf_tweaks/blob/master/.travis.yml

coveralls · 2017-02-26T19:26:28Z

Coverage decreased (-4.9%) to 41.84% when pulling 98bfa7c on feature/APD-246-migrate-to-django-master into 4c77aea on master.

coveralls · 2017-02-26T19:46:29Z

Coverage increased (+1.04%) to 47.758% when pulling ea33777 on feature/APD-246-migrate-to-django-master into 4c77aea on master.

remik · 2017-02-27T15:16:56Z

ydcommon/management/commands/run_qunit.py

-        data = RequestContext(request)
-        for template_dir in settings.TEMPLATE_DIRS:
+        data = RequestContext(request).dicts[0]
+        for template_dir in settings.TEMPLATES[0]['DIRS']:


This is for new Django, we should support both versions.

remik · 2017-02-27T15:17:56Z

ydcommon/views.py

@@ -13,7 +13,11 @@ class QunitTestsView(TemplateView):
    def get_context_data(self, **kwargs):
        context = super(QunitTestsView, self).get_context_data(**kwargs)
        if not kwargs['path'] or kwargs['path'] == 'index':
-            for template_dir in settings.TEMPLATE_DIRS:
+            template_dirs = (
+                list(getattr(settings, 'TEMPLATES', [{'DIRS': []}])[0]['DIRS']) +


Does it not break for old way? There won't be 0 key.

coveralls · 2017-03-01T16:34:31Z

Coverage increased (+1.1%) to 47.852% when pulling 8a6f41e on feature/APD-246-migrate-to-django-master into 4c77aea on master.

coveralls · 2017-03-01T16:34:35Z

Coverage increased (+1.1%) to 47.852% when pulling 8a6f41e on feature/APD-246-migrate-to-django-master into 4c77aea on master.

remik · 2017-03-01T20:04:41Z

@poxip Still missing changes for templates dir.

poxip · 2017-03-02T16:12:06Z

@remik Yes, I know that, I just didn't have the time yesterday to get everything done (doing it today tho) ;)

coveralls · 2017-03-02T18:57:51Z

Coverage increased (+2.7%) to 49.432% when pulling a6141c1 on feature/APD-246-migrate-to-django-master into 4c77aea on master.

APD-246 - [BE] migrate project to work under Django master branch

d215f7f

This also provides backwards compatibility with Django 1.8, 1.9, 1.10, 1.11a1

poxip added 2 commits February 9, 2017 13:08

APD-246 - [BE] add Django 1.9, 1.10 to .travis.yml

322ab17

APD-246 - [BE] correct a little mistake in previous commit

3c0f780

jacoor requested review from remik and jacoor February 20, 2017 12:40

jacoor suggested changes Feb 20, 2017

View reviewed changes

remik suggested changes Feb 20, 2017

View reviewed changes

jacoor approved these changes Feb 23, 2017

View reviewed changes

poxip added 2 commits February 26, 2017 20:03

Fix issues described in comments in PR

37f9543

Correct travis configuration

98bfa7c

Fix coverage settings

ea33777

remik suggested changes Feb 27, 2017

View reviewed changes

Correct check_migrations command

8a6f41e

Add a simple utility for getting template dirs

a6141c1

remik approved these changes Mar 2, 2017

View reviewed changes

poxip merged commit db53047 into master Apr 19, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

APD-246 - [BE] migrate project to work under Django master branch #13

APD-246 - [BE] migrate project to work under Django master branch #13

poxip commented Feb 9, 2017

coveralls commented Feb 9, 2017 •

edited

coveralls commented Feb 9, 2017 •

edited

coveralls commented Feb 9, 2017 •

edited

jacoor Feb 20, 2017

remik Feb 20, 2017

jacoor Feb 20, 2017

poxip Feb 22, 2017

remik Feb 20, 2017

jacoor Feb 20, 2017

remik Feb 20, 2017

remik Feb 20, 2017

remik Feb 20, 2017

remik Feb 20, 2017

jacoor Feb 27, 2017

remik Feb 20, 2017

jacoor Feb 20, 2017

remik Feb 20, 2017

jacoor Feb 23, 2017

remik Feb 20, 2017

remik Feb 20, 2017

coveralls commented Feb 26, 2017 •

edited

coveralls commented Feb 26, 2017 •

edited

remik Feb 27, 2017

remik Feb 27, 2017

coveralls commented Mar 1, 2017 •

edited

coveralls commented Mar 1, 2017

remik commented Mar 1, 2017

poxip commented Mar 2, 2017 •

edited

coveralls commented Mar 2, 2017 •

edited

		@@ -1,3 +1,2 @@
		Django>=1.8.7, <1.9 # rq.filter: >=1.8.7,< 1.9

APD-246 - [BE] migrate project to work under Django master branch #13

APD-246 - [BE] migrate project to work under Django master branch #13

Conversation

poxip commented Feb 9, 2017

coveralls commented Feb 9, 2017 • edited

coveralls commented Feb 9, 2017 • edited

coveralls commented Feb 9, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Feb 26, 2017 • edited

coveralls commented Feb 26, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Mar 1, 2017 • edited

coveralls commented Mar 1, 2017

remik commented Mar 1, 2017

poxip commented Mar 2, 2017 • edited

coveralls commented Mar 2, 2017 • edited

coveralls commented Feb 9, 2017 •

edited

coveralls commented Feb 9, 2017 •

edited

coveralls commented Feb 9, 2017 •

edited

coveralls commented Feb 26, 2017 •

edited

coveralls commented Feb 26, 2017 •

edited

coveralls commented Mar 1, 2017 •

edited

poxip commented Mar 2, 2017 •

edited

coveralls commented Mar 2, 2017 •

edited