From 2d3de7f1c8db2c1c48d93d7baedf9782a72f8965 Mon Sep 17 00:00:00 2001 From: David Fischer Date: Tue, 9 Jan 2018 20:08:06 -0800 Subject: [PATCH 1/2] Add programming language to API/READTHEDOCS_DATA --- readthedocs/doc_builder/backends/mkdocs.py | 1 + readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl | 1 + readthedocs/restapi/serializers.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/readthedocs/doc_builder/backends/mkdocs.py b/readthedocs/doc_builder/backends/mkdocs.py index 54cb593fc17..dfb5cda8b82 100644 --- a/readthedocs/doc_builder/backends/mkdocs.py +++ b/readthedocs/doc_builder/backends/mkdocs.py @@ -123,6 +123,7 @@ def generate_rtd_data(self, docs_dir): 'project': self.version.project.slug, 'version': self.version.slug, 'language': self.version.project.language, + 'programming_language': self.version.project.programming_language, 'page': None, 'theme': "readthedocs", 'builder': "mkdocs", diff --git a/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl b/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl index c68dd94ca4d..3e3fab0ea67 100644 --- a/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl +++ b/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl @@ -93,6 +93,7 @@ context = { 'slug': '{{ project.slug }}', 'name': u'{{ project.name }}', 'rtd_language': u'{{ project.language }}', + 'programming_language': u'{{ project.programming_language }}', 'canonical_url': '{{ project.get_canonical_url }}', 'analytics_code': '{{ project.analytics_code }}', 'single_version': {{ project.single_version }}, diff --git a/readthedocs/restapi/serializers.py b/readthedocs/restapi/serializers.py index 7aac3dd18d2..243ce3363c0 100644 --- a/readthedocs/restapi/serializers.py +++ b/readthedocs/restapi/serializers.py @@ -18,7 +18,7 @@ class Meta(object): fields = ( 'id', 'name', 'slug', 'description', 'language', - 'repo', 'repo_type', + 'programming_language', 'repo', 'repo_type', 'default_version', 'default_branch', 'documentation_type', 'users', From 9289d54ccd6e8d258cad75d7964b7137f2614b70 Mon Sep 17 00:00:00 2001 From: David Fischer Date: Tue, 9 Jan 2018 21:41:52 -0800 Subject: [PATCH 2/2] Project API response test fix --- readthedocs/rtd_tests/tests/test_api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/readthedocs/rtd_tests/tests/test_api.py b/readthedocs/rtd_tests/tests/test_api.py index 75e2a7e1f34..f790ffde92f 100644 --- a/readthedocs/rtd_tests/tests/test_api.py +++ b/readthedocs/rtd_tests/tests/test_api.py @@ -560,6 +560,7 @@ def test_get_version_by_id(self): 'install_project': False, 'language': 'en', 'name': 'Pip', + 'programming_language': 'words', 'python_interpreter': 'python', 'repo': 'https://github.com/pypa/pip', 'repo_type': 'git',