From 385b6c0a931d3e137710c70d8d68c3c2811a6682 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 27 Jun 2019 17:50:56 +0200 Subject: [PATCH 1/7] Remove description from ProjectSerializer It's preferable to remove it now and re-add it later once we decide if it will be completely removed from DB or not. --- readthedocs/api/v3/serializers.py | 3 --- readthedocs/api/v3/tests/responses/projects-detail.json | 1 - readthedocs/api/v3/tests/responses/projects-list.json | 1 - .../api/v3/tests/responses/projects-subprojects-list.json | 2 -- readthedocs/api/v3/tests/responses/projects-superproject.json | 1 - .../v3/tests/responses/projects-versions-builds-list_POST.json | 1 - 6 files changed, 9 deletions(-) diff --git a/readthedocs/api/v3/serializers.py b/readthedocs/api/v3/serializers.py index f820449091d..e37e50d731c 100644 --- a/readthedocs/api/v3/serializers.py +++ b/readthedocs/api/v3/serializers.py @@ -399,8 +399,6 @@ class ProjectSerializer(FlexFieldsModelSerializer): tags = serializers.StringRelatedField(many=True) users = UserSerializer(many=True) - description = serializers.SerializerMethodField() - _links = ProjectLinksSerializer(source='*') # TODO: adapt these fields with the proper names in the db and then remove @@ -426,7 +424,6 @@ class Meta: 'id', 'name', 'slug', - 'description', 'created', 'modified', 'language', diff --git a/readthedocs/api/v3/tests/responses/projects-detail.json b/readthedocs/api/v3/tests/responses/projects-detail.json index 25e7b775e05..371e012fbcb 100644 --- a/readthedocs/api/v3/tests/responses/projects-detail.json +++ b/readthedocs/api/v3/tests/responses/projects-detail.json @@ -51,7 +51,6 @@ "created": "2019-04-29T10:00:00Z", "default_branch": "master", "default_version": "latest", - "description": "Project description", "id": 1, "language": { "code": "en", diff --git a/readthedocs/api/v3/tests/responses/projects-list.json b/readthedocs/api/v3/tests/responses/projects-list.json index 20f001fc8e5..0348d3971c4 100644 --- a/readthedocs/api/v3/tests/responses/projects-list.json +++ b/readthedocs/api/v3/tests/responses/projects-list.json @@ -7,7 +7,6 @@ "id": 1, "name": "project", "slug": "project", - "description": "Project description", "created": "2019-04-29T10:00:00Z", "modified": "2019-04-29T12:00:00Z", "language": { diff --git a/readthedocs/api/v3/tests/responses/projects-subprojects-list.json b/readthedocs/api/v3/tests/responses/projects-subprojects-list.json index 806fdbf2d0c..0f389255bdd 100644 --- a/readthedocs/api/v3/tests/responses/projects-subprojects-list.json +++ b/readthedocs/api/v3/tests/responses/projects-subprojects-list.json @@ -7,7 +7,6 @@ "id": 2, "name": "subproject", "slug": "subproject", - "description": "SubProject description", "created": "2019-04-29T10:00:00Z", "modified": "2019-04-29T12:00:00Z", "language": { @@ -32,7 +31,6 @@ "id": 1, "name": "project", "slug": "project", - "description": "Project description", "created": "2019-04-29T10:00:00Z", "modified": "2019-04-29T12:00:00Z", "language": { diff --git a/readthedocs/api/v3/tests/responses/projects-superproject.json b/readthedocs/api/v3/tests/responses/projects-superproject.json index 293ac76a07d..47e35d3ef1f 100644 --- a/readthedocs/api/v3/tests/responses/projects-superproject.json +++ b/readthedocs/api/v3/tests/responses/projects-superproject.json @@ -2,7 +2,6 @@ "created": "2019-04-29T10:00:00Z", "default_branch": "master", "default_version": "latest", - "description": "Project description", "id": 1, "language": { "code": "en", diff --git a/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json b/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json index 5375b95f12b..1b8e13b5ac3 100644 --- a/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json +++ b/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json @@ -23,7 +23,6 @@ "created": "2019-04-29T10:00:00Z", "default_branch": "master", "default_version": "latest", - "description": "Project description", "id": 1, "language": { "code": "en", From 2ccf2d05a67d2f0b528a1a482671311de393d2d5 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 27 Jun 2019 18:29:22 +0200 Subject: [PATCH 2/7] Move project_homepage to the root of Project details --- readthedocs/api/v3/serializers.py | 11 ++++++----- .../api/v3/tests/responses/projects-detail.json | 4 ++-- readthedocs/api/v3/tests/responses/projects-list.json | 4 ++-- .../v3/tests/responses/projects-subprojects-list.json | 8 ++++---- .../api/v3/tests/responses/projects-superproject.json | 4 ++-- .../responses/projects-versions-builds-list_POST.json | 4 ++-- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/readthedocs/api/v3/serializers.py b/readthedocs/api/v3/serializers.py index e37e50d731c..204241c6dc4 100644 --- a/readthedocs/api/v3/serializers.py +++ b/readthedocs/api/v3/serializers.py @@ -303,11 +303,6 @@ def get_name(self, programming_language): class ProjectURLsSerializer(serializers.Serializer): documentation = serializers.CharField(source='get_docs_url') - project_homepage = serializers.SerializerMethodField() - - def get_project_homepage(self, obj): - # Overridden only to return ``None`` when the description is ``''`` - return obj.project_url or None class RepositorySerializer(serializers.Serializer): @@ -388,6 +383,7 @@ def get_translations(self, obj): class ProjectSerializer(FlexFieldsModelSerializer): + project_homepage = serializers.SerializerMethodField() language = LanguageSerializer() programming_language = ProgrammingLanguageSerializer() repository = RepositorySerializer(source='*') @@ -428,6 +424,7 @@ class Meta: 'modified', 'language', 'programming_language', + 'project_homepage', 'repository', 'default_version', 'default_branch', @@ -446,6 +443,10 @@ class Meta: '_links', ] + def get_project_homepage(self, obj): + # Overridden only to return ``None`` when the description is ``''`` + return obj.project_url or None + def get_description(self, obj): # Overridden only to return ``None`` when the description is ``''`` return obj.description or None diff --git a/readthedocs/api/v3/tests/responses/projects-detail.json b/readthedocs/api/v3/tests/responses/projects-detail.json index 371e012fbcb..ffc88865fff 100644 --- a/readthedocs/api/v3/tests/responses/projects-detail.json +++ b/readthedocs/api/v3/tests/responses/projects-detail.json @@ -75,6 +75,7 @@ "code": "words", "name": "Only Words" }, + "project_homepage": "http://project.com", "repository": { "type": "git", "url": "https://github.com/rtfd/project" @@ -88,8 +89,7 @@ ], "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/en/latest/", - "project_homepage": "http://project.com" + "documentation": "http://readthedocs.org/docs/project/en/latest/" }, "users": [ { diff --git a/readthedocs/api/v3/tests/responses/projects-list.json b/readthedocs/api/v3/tests/responses/projects-list.json index 0348d3971c4..b52c80153ce 100644 --- a/readthedocs/api/v3/tests/responses/projects-list.json +++ b/readthedocs/api/v3/tests/responses/projects-list.json @@ -17,6 +17,7 @@ "code": "words", "name": "Only Words" }, + "project_homepage": "http://project.com", "repository": { "url": "https://github.com/rtfd/project", "type": "git" @@ -30,8 +31,7 @@ "subproject_of": null, "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/en/latest/", - "project_homepage": "http://project.com" + "documentation": "http://readthedocs.org/docs/project/en/latest/" }, "tags": [ "tag", diff --git a/readthedocs/api/v3/tests/responses/projects-subprojects-list.json b/readthedocs/api/v3/tests/responses/projects-subprojects-list.json index 0f389255bdd..59e9db01d4a 100644 --- a/readthedocs/api/v3/tests/responses/projects-subprojects-list.json +++ b/readthedocs/api/v3/tests/responses/projects-subprojects-list.json @@ -17,6 +17,7 @@ "code": "words", "name": "Only Words" }, + "project_homepage": "http://subproject.com", "repository": { "url": "https://github.com/rtfd/subproject", "type": "git" @@ -41,6 +42,7 @@ "code": "words", "name": "Only Words" }, + "project_homepage": "http://project.com", "repository": { "url": "https://github.com/rtfd/project", "type": "git" @@ -54,8 +56,7 @@ "subproject_of": null, "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/en/latest/", - "project_homepage": "http://project.com" + "documentation": "http://readthedocs.org/docs/project/en/latest/" }, "tags": [ "tag", @@ -80,8 +81,7 @@ }, "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/projects/subproject/en/latest/", - "project_homepage": "http://subproject.com" + "documentation": "http://readthedocs.org/docs/project/projects/subproject/en/latest/" }, "tags": [], "users": [], diff --git a/readthedocs/api/v3/tests/responses/projects-superproject.json b/readthedocs/api/v3/tests/responses/projects-superproject.json index 47e35d3ef1f..b7799a46e84 100644 --- a/readthedocs/api/v3/tests/responses/projects-superproject.json +++ b/readthedocs/api/v3/tests/responses/projects-superproject.json @@ -26,6 +26,7 @@ "code": "words", "name": "Only Words" }, + "project_homepage": "http://project.com", "repository": { "type": "git", "url": "https://github.com/rtfd/project" @@ -39,8 +40,7 @@ ], "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/en/latest/", - "project_homepage": "http://project.com" + "documentation": "http://readthedocs.org/docs/project/en/latest/" }, "users": [ { diff --git a/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json b/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json index 1b8e13b5ac3..3eae9f3713d 100644 --- a/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json +++ b/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json @@ -47,6 +47,7 @@ "code": "words", "name": "Only Words" }, + "project_homepage": "http://project.com", "repository": { "type": "git", "url": "https://github.com/rtfd/project" @@ -60,8 +61,7 @@ ], "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/en/latest/", - "project_homepage": "http://project.com" + "documentation": "http://readthedocs.org/docs/project/en/latest/" }, "users": [ { From 60f59bbd0db2250694fab5789fa309bdfb119d80 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 1 Jul 2019 15:51:26 +0200 Subject: [PATCH 3/7] Add user-facing URLs under `urls` field --- readthedocs/api/v3/serializers.py | 19 ++++++++++++++++++- .../v3/tests/responses/projects-detail.json | 5 ++++- .../api/v3/tests/responses/projects-list.json | 5 ++++- .../responses/projects-subprojects-list.json | 10 ++++++++-- .../responses/projects-superproject.json | 5 ++++- .../projects-versions-builds-list_POST.json | 5 ++++- 6 files changed, 42 insertions(+), 7 deletions(-) diff --git a/readthedocs/api/v3/serializers.py b/readthedocs/api/v3/serializers.py index 204241c6dc4..9627e486027 100644 --- a/readthedocs/api/v3/serializers.py +++ b/readthedocs/api/v3/serializers.py @@ -301,8 +301,25 @@ def get_name(self, programming_language): return 'Unknown' -class ProjectURLsSerializer(serializers.Serializer): +class ProjectURLsSerializer(BaseLinksSerializer, serializers.Serializer): + """Serializer with all the user-facing URLs under Read the Docs.""" + documentation = serializers.CharField(source='get_docs_url') + homepage = serializers.SerializerMethodField() + builds = serializers.SerializerMethodField() + versions = serializers.SerializerMethodField() + + def get_homepage(self, obj): + path = reverse('projects_detail', kwargs={'project_slug': obj.slug}) + return self._absolute_url(path) + + def get_builds(self, obj): + path = reverse('builds_project_list', kwargs={'project_slug': obj.slug}) + return self._absolute_url(path) + + def get_versions(self, obj): + path = reverse('project_version_list', kwargs={'project_slug': obj.slug}) + return self._absolute_url(path) class RepositorySerializer(serializers.Serializer): diff --git a/readthedocs/api/v3/tests/responses/projects-detail.json b/readthedocs/api/v3/tests/responses/projects-detail.json index ffc88865fff..7b0eab690c3 100644 --- a/readthedocs/api/v3/tests/responses/projects-detail.json +++ b/readthedocs/api/v3/tests/responses/projects-detail.json @@ -89,7 +89,10 @@ ], "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/en/latest/" + "builds": "https://readthedocs.org/projects/project/builds/", + "documentation": "http://readthedocs.org/docs/project/en/latest/", + "homepage": "https://readthedocs.org/projects/project/", + "versions": "https://readthedocs.org/projects/project/versions/" }, "users": [ { diff --git a/readthedocs/api/v3/tests/responses/projects-list.json b/readthedocs/api/v3/tests/responses/projects-list.json index b52c80153ce..b77eff43c79 100644 --- a/readthedocs/api/v3/tests/responses/projects-list.json +++ b/readthedocs/api/v3/tests/responses/projects-list.json @@ -31,7 +31,10 @@ "subproject_of": null, "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/en/latest/" + "builds": "https://readthedocs.org/projects/project/builds/", + "documentation": "http://readthedocs.org/docs/project/en/latest/", + "homepage": "https://readthedocs.org/projects/project/", + "versions": "https://readthedocs.org/projects/project/versions/" }, "tags": [ "tag", diff --git a/readthedocs/api/v3/tests/responses/projects-subprojects-list.json b/readthedocs/api/v3/tests/responses/projects-subprojects-list.json index 59e9db01d4a..a5c0e317586 100644 --- a/readthedocs/api/v3/tests/responses/projects-subprojects-list.json +++ b/readthedocs/api/v3/tests/responses/projects-subprojects-list.json @@ -56,7 +56,10 @@ "subproject_of": null, "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/en/latest/" + "builds": "https://readthedocs.org/projects/project/builds/", + "documentation": "http://readthedocs.org/docs/project/en/latest/", + "homepage": "https://readthedocs.org/projects/project/", + "versions": "https://readthedocs.org/projects/project/versions/" }, "tags": [ "tag", @@ -81,7 +84,10 @@ }, "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/projects/subproject/en/latest/" + "builds": "https://readthedocs.org/projects/subproject/builds/", + "documentation": "http://readthedocs.org/docs/project/projects/subproject/en/latest/", + "homepage": "https://readthedocs.org/projects/subproject/", + "versions": "https://readthedocs.org/projects/subproject/versions/" }, "tags": [], "users": [], diff --git a/readthedocs/api/v3/tests/responses/projects-superproject.json b/readthedocs/api/v3/tests/responses/projects-superproject.json index b7799a46e84..0f36e63bbdd 100644 --- a/readthedocs/api/v3/tests/responses/projects-superproject.json +++ b/readthedocs/api/v3/tests/responses/projects-superproject.json @@ -40,7 +40,10 @@ ], "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/en/latest/" + "builds": "https://readthedocs.org/projects/project/builds/", + "documentation": "http://readthedocs.org/docs/project/en/latest/", + "homepage": "https://readthedocs.org/projects/project/", + "versions": "https://readthedocs.org/projects/project/versions/" }, "users": [ { diff --git a/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json b/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json index 3eae9f3713d..1199f8cb62f 100644 --- a/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json +++ b/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json @@ -61,7 +61,10 @@ ], "translation_of": null, "urls": { - "documentation": "http://readthedocs.org/docs/project/en/latest/" + "builds": "https://readthedocs.org/projects/project/builds/", + "documentation": "http://readthedocs.org/docs/project/en/latest/", + "homepage": "https://readthedocs.org/projects/project/", + "versions": "https://readthedocs.org/projects/project/versions/" }, "users": [ { From bdde6d3803c1a2d616fa90da4ef8d5ce26d810b1 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Wed, 3 Jul 2019 14:35:10 +0200 Subject: [PATCH 4/7] Small lint fix --- readthedocs/api/v3/serializers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/readthedocs/api/v3/serializers.py b/readthedocs/api/v3/serializers.py index 9627e486027..bae228f7d2d 100644 --- a/readthedocs/api/v3/serializers.py +++ b/readthedocs/api/v3/serializers.py @@ -302,6 +302,7 @@ def get_name(self, programming_language): class ProjectURLsSerializer(BaseLinksSerializer, serializers.Serializer): + """Serializer with all the user-facing URLs under Read the Docs.""" documentation = serializers.CharField(source='get_docs_url') From 74e851a6e4ad63f60df1182e63133ffd2b1cdba1 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 8 Jul 2019 09:02:58 +0200 Subject: [PATCH 5/7] Delete method --- readthedocs/api/v3/serializers.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/readthedocs/api/v3/serializers.py b/readthedocs/api/v3/serializers.py index bae228f7d2d..64d5da256da 100644 --- a/readthedocs/api/v3/serializers.py +++ b/readthedocs/api/v3/serializers.py @@ -465,10 +465,6 @@ def get_project_homepage(self, obj): # Overridden only to return ``None`` when the description is ``''`` return obj.project_url or None - def get_description(self, obj): - # Overridden only to return ``None`` when the description is ``''`` - return obj.description or None - def get_translation_of(self, obj): if obj.main_language_project: return self.__class__(obj.main_language_project).data From 39fde976fcb118b31b4029651bcc49517e1e14c4 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 8 Jul 2019 09:03:10 +0200 Subject: [PATCH 6/7] Comment --- readthedocs/api/v3/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readthedocs/api/v3/serializers.py b/readthedocs/api/v3/serializers.py index 64d5da256da..50a4d75a527 100644 --- a/readthedocs/api/v3/serializers.py +++ b/readthedocs/api/v3/serializers.py @@ -462,7 +462,7 @@ class Meta: ] def get_project_homepage(self, obj): - # Overridden only to return ``None`` when the description is ``''`` + # Overridden only to return ``None`` when the project_url is ``''`` return obj.project_url or None def get_translation_of(self, obj): From ea3cade10b93282c8c8c5af24f2baa362465722e Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 8 Jul 2019 09:07:22 +0200 Subject: [PATCH 7/7] Rename fields: project_homepage and homepage --- readthedocs/api/v3/serializers.py | 10 +++++----- .../api/v3/tests/responses/projects-detail.json | 4 ++-- readthedocs/api/v3/tests/responses/projects-list.json | 4 ++-- .../v3/tests/responses/projects-subprojects-list.json | 8 ++++---- .../api/v3/tests/responses/projects-superproject.json | 4 ++-- .../responses/projects-versions-builds-list_POST.json | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/readthedocs/api/v3/serializers.py b/readthedocs/api/v3/serializers.py index 50a4d75a527..ee2787ddb73 100644 --- a/readthedocs/api/v3/serializers.py +++ b/readthedocs/api/v3/serializers.py @@ -306,11 +306,11 @@ class ProjectURLsSerializer(BaseLinksSerializer, serializers.Serializer): """Serializer with all the user-facing URLs under Read the Docs.""" documentation = serializers.CharField(source='get_docs_url') - homepage = serializers.SerializerMethodField() + home = serializers.SerializerMethodField() builds = serializers.SerializerMethodField() versions = serializers.SerializerMethodField() - def get_homepage(self, obj): + def get_home(self, obj): path = reverse('projects_detail', kwargs={'project_slug': obj.slug}) return self._absolute_url(path) @@ -401,7 +401,7 @@ def get_translations(self, obj): class ProjectSerializer(FlexFieldsModelSerializer): - project_homepage = serializers.SerializerMethodField() + homepage = serializers.SerializerMethodField() language = LanguageSerializer() programming_language = ProgrammingLanguageSerializer() repository = RepositorySerializer(source='*') @@ -442,7 +442,7 @@ class Meta: 'modified', 'language', 'programming_language', - 'project_homepage', + 'homepage', 'repository', 'default_version', 'default_branch', @@ -461,7 +461,7 @@ class Meta: '_links', ] - def get_project_homepage(self, obj): + def get_homepage(self, obj): # Overridden only to return ``None`` when the project_url is ``''`` return obj.project_url or None diff --git a/readthedocs/api/v3/tests/responses/projects-detail.json b/readthedocs/api/v3/tests/responses/projects-detail.json index 7b0eab690c3..a6367738d7e 100644 --- a/readthedocs/api/v3/tests/responses/projects-detail.json +++ b/readthedocs/api/v3/tests/responses/projects-detail.json @@ -75,7 +75,7 @@ "code": "words", "name": "Only Words" }, - "project_homepage": "http://project.com", + "homepage": "http://project.com", "repository": { "type": "git", "url": "https://github.com/rtfd/project" @@ -91,7 +91,7 @@ "urls": { "builds": "https://readthedocs.org/projects/project/builds/", "documentation": "http://readthedocs.org/docs/project/en/latest/", - "homepage": "https://readthedocs.org/projects/project/", + "home": "https://readthedocs.org/projects/project/", "versions": "https://readthedocs.org/projects/project/versions/" }, "users": [ diff --git a/readthedocs/api/v3/tests/responses/projects-list.json b/readthedocs/api/v3/tests/responses/projects-list.json index b77eff43c79..63abb945905 100644 --- a/readthedocs/api/v3/tests/responses/projects-list.json +++ b/readthedocs/api/v3/tests/responses/projects-list.json @@ -17,7 +17,7 @@ "code": "words", "name": "Only Words" }, - "project_homepage": "http://project.com", + "homepage": "http://project.com", "repository": { "url": "https://github.com/rtfd/project", "type": "git" @@ -33,7 +33,7 @@ "urls": { "builds": "https://readthedocs.org/projects/project/builds/", "documentation": "http://readthedocs.org/docs/project/en/latest/", - "homepage": "https://readthedocs.org/projects/project/", + "home": "https://readthedocs.org/projects/project/", "versions": "https://readthedocs.org/projects/project/versions/" }, "tags": [ diff --git a/readthedocs/api/v3/tests/responses/projects-subprojects-list.json b/readthedocs/api/v3/tests/responses/projects-subprojects-list.json index a5c0e317586..09051066299 100644 --- a/readthedocs/api/v3/tests/responses/projects-subprojects-list.json +++ b/readthedocs/api/v3/tests/responses/projects-subprojects-list.json @@ -17,7 +17,7 @@ "code": "words", "name": "Only Words" }, - "project_homepage": "http://subproject.com", + "homepage": "http://subproject.com", "repository": { "url": "https://github.com/rtfd/subproject", "type": "git" @@ -42,7 +42,7 @@ "code": "words", "name": "Only Words" }, - "project_homepage": "http://project.com", + "homepage": "http://project.com", "repository": { "url": "https://github.com/rtfd/project", "type": "git" @@ -58,7 +58,7 @@ "urls": { "builds": "https://readthedocs.org/projects/project/builds/", "documentation": "http://readthedocs.org/docs/project/en/latest/", - "homepage": "https://readthedocs.org/projects/project/", + "home": "https://readthedocs.org/projects/project/", "versions": "https://readthedocs.org/projects/project/versions/" }, "tags": [ @@ -86,7 +86,7 @@ "urls": { "builds": "https://readthedocs.org/projects/subproject/builds/", "documentation": "http://readthedocs.org/docs/project/projects/subproject/en/latest/", - "homepage": "https://readthedocs.org/projects/subproject/", + "home": "https://readthedocs.org/projects/subproject/", "versions": "https://readthedocs.org/projects/subproject/versions/" }, "tags": [], diff --git a/readthedocs/api/v3/tests/responses/projects-superproject.json b/readthedocs/api/v3/tests/responses/projects-superproject.json index 0f36e63bbdd..ae1a748c975 100644 --- a/readthedocs/api/v3/tests/responses/projects-superproject.json +++ b/readthedocs/api/v3/tests/responses/projects-superproject.json @@ -26,7 +26,7 @@ "code": "words", "name": "Only Words" }, - "project_homepage": "http://project.com", + "homepage": "http://project.com", "repository": { "type": "git", "url": "https://github.com/rtfd/project" @@ -42,7 +42,7 @@ "urls": { "builds": "https://readthedocs.org/projects/project/builds/", "documentation": "http://readthedocs.org/docs/project/en/latest/", - "homepage": "https://readthedocs.org/projects/project/", + "home": "https://readthedocs.org/projects/project/", "versions": "https://readthedocs.org/projects/project/versions/" }, "users": [ diff --git a/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json b/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json index 1199f8cb62f..2c3347509e6 100644 --- a/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json +++ b/readthedocs/api/v3/tests/responses/projects-versions-builds-list_POST.json @@ -47,7 +47,7 @@ "code": "words", "name": "Only Words" }, - "project_homepage": "http://project.com", + "homepage": "http://project.com", "repository": { "type": "git", "url": "https://github.com/rtfd/project" @@ -63,7 +63,7 @@ "urls": { "builds": "https://readthedocs.org/projects/project/builds/", "documentation": "http://readthedocs.org/docs/project/en/latest/", - "homepage": "https://readthedocs.org/projects/project/", + "home": "https://readthedocs.org/projects/project/", "versions": "https://readthedocs.org/projects/project/versions/" }, "users": [