Merge branch 'master' into pyup-scheduled-update-2020-12-21

n2ygk · web-flow · commit 0d2ba3eba9f2 · 2021-01-02T11:45:27.000-05:00
diff --git a/README.rst b/README.rst
@@ -2,7 +2,7 @@
 JSON API and Django Rest Framework
 ==================================
 
-.. image:: hhttps://github.com/django-json-api/django-rest-framework-json-api/workflows/Tests/badge.svg
+.. image:: https://github.com/django-json-api/django-rest-framework-json-api/workflows/Tests/badge.svg
    :alt: Tests
    :target: https://github.com/django-json-api/django-rest-framework-json-api/actions
 
diff --git a/example/tests/test_serializers.py b/example/tests/test_serializers.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 from unittest import mock
 
 import pytest
@@ -88,7 +89,7 @@ class Meta:
                         [
                             ("name", "Some Blog"),
                             ("tags", []),
-                            ("copyright", 2020),
+                            ("copyright", datetime.now().year),
                             ("url", "http://testserver/blogs/1"),
                         ]
                     ),

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+from datetime import datetime`
`1`	`2`	`from unittest import mock`
`2`	`3`
`3`	`4`	`import pytest`
`@@ -88,7 +89,7 @@ class Meta:`
`88`	`89`	`[`
`89`	`90`	`("name", "Some Blog"),`
`90`	`91`	`("tags", []),`
`91`		`- ("copyright", 2020),`
	`92`	`+ ("copyright", datetime.now().year),`
`92`	`93`	`("url", "http://testserver/blogs/1"),`
`93`	`94`	`]`
`94`	`95`	`),`