-
Notifications
You must be signed in to change notification settings - Fork 3.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixing make docs issue #25799
Fixing make docs issue #25799
Conversation
@@ -282,7 +282,7 @@ def on_init(app): # pylint: disable=unused-argument | |||
apidoc_path = os.path.join(bin_path, apidoc_path) | |||
exclude_dirs = ['envs', 'migrations', 'test', 'tests'] | |||
exclude_dirs.extend(cms_djangoapps) | |||
exclude_dirs.extend(lms_djangoapps) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lms_djangoapps
was removed in this commit.
but its reference remains.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suspect we can rip out all this out pretty soon, but probably best to wait until the sys.path hack removal is fully complete.
Latest issue is coming due to
|
@@ -282,7 +282,7 @@ def on_init(app): # pylint: disable=unused-argument | |||
apidoc_path = os.path.join(bin_path, apidoc_path) | |||
exclude_dirs = ['envs', 'migrations', 'test', 'tests'] | |||
exclude_dirs.extend(cms_djangoapps) | |||
exclude_dirs.extend(lms_djangoapps) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suspect we can rip out all this out pretty soon, but probably best to wait until the sys.path hack removal is fully complete.
|
The issue with |
325aaac
to
e5790db
Compare
d7f8a67
to
706757f
Compare
@@ -41,6 +41,8 @@ | |||
'contentstore.apps.ContentstoreConfig', | |||
'cms.djangoapps.course_creators', | |||
'xblock_config.apps.XBlockConfig', | |||
'user_tasks', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Defined in lms/envs/common.py
also.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, Dave added that just 2 weeks ago in https://github.com/edx/edx-platform/pull/25933 .
'lms.djangoapps.lti_provider' | ||
]) | ||
|
||
|
||
COMMON_TEST_DATA_ROOT = '' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Otherwise undefined var error appeared.
5f4d7eb
to
9c66a1f
Compare
jenkins run python |
jenkins run all |
1 similar comment
jenkins run all |
c0e7ad5
to
f4f1fc4
Compare
@jmbowman Please review. |
Adding constraint on sphinx.
eec5355
to
1f616f6
Compare
@@ -136,3 +136,6 @@ sympy==1.6.2 | |||
|
|||
# cryptography 3.3.1 started failing tests on sandbox because it dropped support for python3.5 | |||
cryptography==3.2.1 | |||
|
|||
# greater versions breaking the code |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please write a ticket summarizing the problem with newer versions and link to it from here? Also, it looks like the docs requirements file hasn't been updated accordingly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, its due to conflicts. make upgrade
in progress right now.
@@ -41,6 +41,8 @@ | |||
'contentstore.apps.ContentstoreConfig', | |||
'cms.djangoapps.course_creators', | |||
'xblock_config.apps.XBlockConfig', | |||
'user_tasks', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, Dave added that just 2 weeks ago in https://github.com/edx/edx-platform/pull/25933 .
@@ -7,7 +7,7 @@ | |||
|
|||
from openedx.core.djangoapps.theming.helpers import get_current_request | |||
|
|||
from .models import ( | |||
from common.djangoapps.third_party_auth.models import ( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be harmless, but why was it needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it was giving error during make docs command. I will add the complete traceback
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jmbowman Otherwise this error appears
Configuration error:
There is a programmable error in your configuration file:
Traceback (most recent call last):
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/sphinx/config.py", line 319, in eval_config_file
execfile_(filename, namespace)
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/sphinx/util/pycompat.py", line 89, in execfile_
exec(code, _globals)
File "/edx/app/edxapp/edx-platform/docs/guides/conf.py", line 43, in <module>
django.setup()
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/django/__init__.py", line 24, in setup
apps.populate(settings.INSTALLED_APPS)
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/django/apps/registry.py", line 114, in populate
app_config.import_models()
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/django/apps/config.py", line 211, in import_models
self.models_module = import_module(models_module_name)
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/importlib/__init__.py", line 127, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "<frozen importlib._bootstrap>", line 1014, in _gcd_import
File "<frozen importlib._bootstrap>", line 991, in _find_and_load
File "<frozen importlib._bootstrap>", line 975, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 671, in _load_unlocked
File "<frozen importlib._bootstrap_external>", line 783, in exec_module
File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/integrated_channels/sap_success_factors/models.py", line 18, in <module>
from integrated_channels.sap_success_factors.exporters.learner_data import (
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/integrated_channels/sap_success_factors/exporters/learner_data.py", line 14, in <module>
from enterprise.tpa_pipeline import get_user_from_social_auth
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/enterprise/tpa_pipeline.py", line 23, in <module>
from third_party_auth.provider import Registry
File "/edx/app/edxapp/edx-platform/common/djangoapps/third_party_auth/provider.py", line 10, in <module>
from .models import (
File "/edx/app/edxapp/edx-platform/common/djangoapps/third_party_auth/models.py", line 338, in <module>
class OAuth2ProviderConfig(ProviderConfig):
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/django/db/models/base.py", line 316, in __new__
new_class._meta.apps.register_model(new_class._meta.app_label, new_class)
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/django/apps/registry.py", line 227, in register_model
raise RuntimeError(
RuntimeError: Conflicting 'oauth2providerconfig' models in application 'third_party_auth': <class 'common.djangoapps.third_party_auth.models.OAuth2ProviderConfig'> and <class 'third_party_auth.models.OAuth2ProviderConfig'>.
Your PR has finished running tests. There were no failures. |
EdX Release Notice: This PR has been deployed to the staging environment in preparation for a release to production. |
EdX Release Notice: This PR has been deployed to the production environment. |
make docs
command fixed in this PR.Added constraint 3.3.4 was giving error.
sphinx-doc/sphinx#8568
Ticket added for tracking here
HTML generated