Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.coverage',
'sphinx.ext.doctest',
'sphinx.ext.graphviz',
Expand All @@ -68,6 +67,18 @@
'sphinx_design',
'code_annotations.contrib.sphinx.extensions.featuretoggles',
'code_annotations.contrib.sphinx.extensions.settings',
'autoapi.extension',
]

autoapi_type = 'python'
autoapi_dirs = ['../lms', '../openedx']

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


autoapi_ignore = [
'*/migrations/*',
'*/tests/*',
'*.pyc',
'__init__.py',
'**/xblock_serializer/data.py',

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Temporary workaround as It requires too many changes here to be able to build using autoapi.

]

# Rediraffe related settings.
Expand Down Expand Up @@ -277,13 +288,6 @@
'django': ('https://docs.djangoproject.com/en/1.11/', 'https://docs.djangoproject.com/en/1.11/_objects/'),
}

# Mock out these external modules during code import to avoid errors
autodoc_mock_imports = [
'MySQLdb',
'django_mysql',
'pymongo',
]

# Start building a map of the directories relative to the repository root to
# run sphinx-apidoc against and the directories under "docs" in which to store
# the generated *.rst files
Expand Down
10 changes: 5 additions & 5 deletions openedx/core/djangoapps/user_api/accounts/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ def format_social_link(platform_name, new_social_link):
"""
Given a user's social link, returns a safe absolute url for the social link.

Returns the following based on the provided new_social_link:
1) Given an empty string, returns ''
1) Given a valid username, return 'https://www.[platform_name_base][username]'
2) Given a valid URL, return 'https://www.[platform_name_base][username]'
3) Given anything unparseable, returns None
Returns:
- An empty string if `new_social_link` is empty.
- A formatted URL if `new_social_link` is a username.
- Returns `new_social_link` if it is a valid URL.
- None for unparseable inputs.
Comment on lines +54 to +58

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes: ValueError: 'platform_name_base' does not appear to be an IPv4 or IPv6 address

"""
# Blank social links should return '' or None as was passed in.
if not new_social_link:
Expand Down
1 change: 1 addition & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ pycodestyle<2.9.0
# Date: 2021-07-12
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/33560
pylint<2.16.0 # greater version failing quality test. Fix them in seperate ticket.
astroid<2.14.0

# Date: 2021-08-25
# At the time of writing this comment, we do not know whether py2neo>=2022
Expand Down
9 changes: 9 additions & 0 deletions requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,12 @@ asn1crypto==1.5.1
# snowflake-connector-python
astroid==2.13.5
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# pylint
# pylint-celery
# sphinx-autoapi
attrs==24.2.0
# via
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -1103,6 +1106,7 @@ jinja2==3.1.4
# code-annotations
# diff-cover
# sphinx
# sphinx-autoapi
jmespath==1.0.1
# via
# -r requirements/edx/doc.txt
Expand Down Expand Up @@ -1166,6 +1170,7 @@ lazy==1.6
# xblock
lazy-object-proxy==1.10.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# astroid
libsass==0.10.0
Expand Down Expand Up @@ -1799,6 +1804,7 @@ pyyaml==6.0.2
# edx-django-release-util
# edx-i18n-tools
# jsondiff
# sphinx-autoapi
# sphinxcontrib-openapi
# xblock
random2==1.0.2
Expand Down Expand Up @@ -1999,13 +2005,16 @@ sphinx==8.1.3
# via
# -r requirements/edx/doc.txt
# pydata-sphinx-theme
# sphinx-autoapi
# sphinx-book-theme
# sphinx-design
# sphinx-mdinclude
# sphinx-reredirects
# sphinxcontrib-httpdomain
# sphinxcontrib-openapi
# sphinxext-rediraffe
sphinx-autoapi==3.3.3
# via -r requirements/edx/doc.txt
sphinx-book-theme==1.1.3
# via -r requirements/edx/doc.txt
sphinx-design==0.6.1
Expand Down
1 change: 1 addition & 0 deletions requirements/edx/doc.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ sphinx-design # provides various responsive web-components
sphinxcontrib-openapi[markdown] # Be able to render openapi schema in a sphinx project
sphinxext-rediraffe # Quickly and easily redirect when we move pages around.
sphinx-reredirects # Redirect from a sphinx project out to other places on the web including other sphinx projects
sphinx-autoapi
15 changes: 14 additions & 1 deletion requirements/edx/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ asn1crypto==1.5.1
# via
# -r requirements/edx/base.txt
# snowflake-connector-python
astroid==2.13.5
# via
# -c requirements/edx/../constraints.txt
# sphinx-autoapi
attrs==24.2.0
# via
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -790,6 +794,7 @@ jinja2==3.1.4
# -r requirements/edx/base.txt
# code-annotations
# sphinx
# sphinx-autoapi
jmespath==1.0.1
# via
# -r requirements/edx/base.txt
Expand Down Expand Up @@ -840,6 +845,8 @@ lazy==1.6
# lti-consumer-xblock
# ora2
# xblock
lazy-object-proxy==1.10.0
# via astroid
libsass==0.10.0
# via
# -c requirements/edx/../constraints.txt
Expand Down Expand Up @@ -1247,6 +1254,7 @@ pyyaml==6.0.2
# edx-django-release-util
# edx-i18n-tools
# jsondiff
# sphinx-autoapi
# sphinxcontrib-openapi
# xblock
random2==1.0.2
Expand Down Expand Up @@ -1405,13 +1413,16 @@ sphinx==8.1.3
# via
# -r requirements/edx/doc.in
# pydata-sphinx-theme
# sphinx-autoapi
# sphinx-book-theme
# sphinx-design
# sphinx-mdinclude
# sphinx-reredirects
# sphinxcontrib-httpdomain
# sphinxcontrib-openapi
# sphinxext-rediraffe
sphinx-autoapi==3.3.3
# via -r requirements/edx/doc.in
sphinx-book-theme==1.1.3
# via -r requirements/edx/doc.in
sphinx-design==0.6.1
Expand Down Expand Up @@ -1556,7 +1567,9 @@ webob==1.8.9
# -r requirements/edx/base.txt
# xblock
wrapt==1.16.0
# via -r requirements/edx/base.txt
# via
# -r requirements/edx/base.txt
# astroid
xblock[django]==5.1.0
# via
# -r requirements/edx/base.txt
Expand Down
1 change: 1 addition & 0 deletions requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ asn1crypto==1.5.1
# snowflake-connector-python
astroid==2.13.5
# via
# -c requirements/edx/../constraints.txt
# pylint
# pylint-celery
attrs==24.2.0
Expand Down