Fixes for Django 2.1 #6044

blueyed · 2018-06-21T17:58:44Z

~~Needs #6043 also.~~

tomchristie · 2018-06-21T18:12:14Z

Look good. Anyone else?

rpkilby · 2018-06-21T18:46:19Z

#6043 has been merged - would be great if you could rebase.

rpkilby · 2018-06-21T18:47:41Z

tests/test_fields.py

+        """Django 2.1 uses datetime.timezone.utc
+
+        Ref: https://github.com/django/django/pull/9484#issuecomment-399169042"""
+        return tz.utcoffset(None).total_seconds() == 0.0


This check seems a bit funky. Is there no better way to do this?

Agreed - I am also not happy with it.

Asked about in the commit making this necessary: django/django#9484 (comment).

If Django does not change get_default_timezone itself we could also change the test to compare another (the new) "utc" (which is datetime.timezone.utc).

In retrospect, I don't think it's incredibly important to block this PR over the test code. It could be improved, but it's not worth blocking.

The behaviour here will be restored for Django v2.1b2. So if we can keep this in a separate commit it'll just be a revert at that point.

The behaviour here will be restored for Django v2.1b2

Did they revert the original PR?

No code changes AFAIK.
The assumption might be because of https://code.djangoproject.com/ticket/29514 being accepted.

The behaviour change was reverted in django/django@2ec151e. I'd drop this and wait for v2.1b2 to remove from allowed failures.

blueyed · 2018-06-21T20:21:32Z

Should become green now (also master).

rpkilby

I'd say let's hold off until we get some kind of response in regards to django/django#9484. Otherwise, looks good to me.

carltongibson · 2018-06-22T09:18:27Z

django/django#10081. We'll see what Tim says.

timgraham · 2018-06-22T11:58:36Z

tests/test_parsers.py

-        assert file_obj._size == 14
+        try:
+            size = file_obj.size
+        except AttributeError:  # before Django 2.1 _size was private


I guess the relevant change is django/django@a5406fe. I think size would work in older Django versions.

timgraham · 2018-06-22T11:59:20Z

tests/test_permissions.py

-            # add, change, delete built in to django
-        )
+
+        if django.VERSION <= (2, 1):


I think you meant <.

Original concern not important.

rpkilby · 2018-06-22T22:09:25Z

@blueyed - could you push Tim's suggested changes? It would be good to fix the test suite.

blueyed · 2018-06-23T07:05:57Z

Rebased.

timgraham · 2018-06-23T22:50:33Z

tests/test_parsers.py

@@ -62,7 +62,8 @@ def test_parse(self):
        self.stream.seek(0)
        data_and_files = parser.parse(self.stream, None, self.parser_context)
        file_obj = data_and_files.files['file']
-        assert file_obj._size == 14
+        size = file_obj.size


No need for size variable.

blueyed · 2018-07-05T12:18:35Z

Removed e22fb41. Will require 2.1b2 now.

commit e22fb41c
Author: Daniel Hahler <[email protected]>
Date:   Thu Jun 21 18:45:50 2018 +0200

    Fix TestDefaultTZDateTimeField
---
 tests/test_fields.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

──────────────────────────────────────────────────────────────────────────────────────────────
modified: tests/test_fields.py
──────────────────────────────────────────────────────────────────────────────────────────────
@ tests/test_fields.py:1346 @ def setup_class(cls):
         cls.field = serializers.DateTimeField()
         cls.kolkata = pytz.timezone('Asia/Kolkata')

+    @staticmethod
+    def is_utc(tz):
+        """Django 2.1 uses datetime.timezone.utc
+
+        Ref: https://github.com/django/django/pull/9484#issuecomment-399169042"""
+        return tz.utcoffset(None).total_seconds() == 0.0
+
     def test_default_timezone(self):
-        assert self.field.default_timezone() == utc
+        assert self.is_utc(self.field.default_timezone())

     def test_current_timezone(self):
-        assert self.field.default_timezone() == utc
+        assert self.is_utc(self.field.default_timezone())
         activate(self.kolkata)
         assert self.field.default_timezone() == self.kolkata
         deactivate()
-        assert self.field.default_timezone() == utc
+        assert self.is_utc(self.field.default_timezone())


 @pytest.mark.skipif(pytz is None, reason='pytz not installed')

carltongibson · 2018-07-05T16:47:22Z

.travis.yml

@@ -42,7 +42,6 @@ matrix:

    allow_failures:
      - env: DJANGO=master
-      - env: DJANGO=2.1


Drop this line for now and we’ll merge. We can add this after the next release. (Which should be the 16th.)

Ok, removed ac39602.

rpkilby · 2018-07-06T03:51:19Z

Thanks!

blueyed mentioned this pull request Jun 21, 2018

update to 2.1 beta 1 #6037

Merged

rpkilby reviewed Jun 21, 2018

View reviewed changes

blueyed force-pushed the dj21 branch from 4081c77 to 51215f9 Compare June 21, 2018 19:39

rpkilby previously requested changes Jun 21, 2018

View reviewed changes

timgraham reviewed Jun 22, 2018

View reviewed changes

blueyed force-pushed the dj21 branch from ee29aa4 to a6c9625 Compare June 23, 2018 00:10

rpkilby mentioned this pull request Jun 23, 2018

Fix Django 2.1 permissions tests #6055

Merged

blueyed force-pushed the dj21 branch from a6c9625 to 1bacf5b Compare June 23, 2018 18:25

timgraham reviewed Jun 23, 2018

View reviewed changes

blueyed force-pushed the dj21 branch from 1bacf5b to f927b34 Compare June 26, 2018 08:17

auvipy approved these changes Jul 2, 2018

View reviewed changes

blueyed force-pushed the dj21 branch from f927b34 to f907b83 Compare July 5, 2018 12:16

rpkilby approved these changes Jul 5, 2018

View reviewed changes

carltongibson reviewed Jul 5, 2018

View reviewed changes

Fix tests/test_parsers.py::TestFileUploadParser::test_parse

0006d00

blueyed force-pushed the dj21 branch from f907b83 to 0006d00 Compare July 5, 2018 16:51

rpkilby merged commit 56967db into encode:master Jul 6, 2018

pchiquet pushed a commit to pchiquet/django-rest-framework that referenced this pull request Nov 17, 2020

Fix upload parser test (encode#6044)

5fa9f2b

Uh oh!

Fixes for Django 2.1 #6044

Fixes for Django 2.1 #6044

Uh oh!

Conversation

blueyed commented Jun 21, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tomchristie commented Jun 21, 2018

Uh oh!

rpkilby commented Jun 21, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

carltongibson Jul 2, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

blueyed commented Jun 21, 2018

Uh oh!

rpkilby left a comment

Choose a reason for hiding this comment

Uh oh!

carltongibson commented Jun 22, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rpkilby commented Jun 22, 2018

Uh oh!

blueyed commented Jun 23, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

blueyed commented Jul 5, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rpkilby commented Jul 6, 2018

Uh oh!

Uh oh!

blueyed commented Jun 21, 2018 •

edited

Loading

carltongibson Jul 2, 2018 •

edited

Loading