Skip to content
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

Stop creating a conf.py automatically and doing magic around README handling #5609

Merged
merged 18 commits into from
Aug 22, 2023

Conversation

saadmk11
Copy link
Member

@saadmk11 saadmk11 commented Apr 18, 2019

Copy link
Member

@stsewd stsewd left a comment

Choose a reason for hiding this comment

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

We need to remove the autocreated mkdocs.yaml for mkdocs projects too https://github.com/rtfd/readthedocs.org/blob/43c1ba7e8b65bc3bb5a8b2d7b7f6de94dfa91b44/readthedocs/doc_builder/backends/mkdocs.py#L88-L91

The index page generation should stay, this is another issue we need to resolve in another PR (right now we should generate an index if we don't find one)

readthedocs/doc_builder/backends/sphinx.py Show resolved Hide resolved
readthedocs/doc_builder/backends/sphinx.py Outdated Show resolved Hide resolved
@saadmk11
Copy link
Member Author

@stsewd Updated the PR according to your suggestions.

@saadmk11
Copy link
Member Author

@stsewd Updated the PR

@saadmk11
Copy link
Member Author

saadmk11 commented May 9, 2019

resolved conflicts

Copy link
Member

@stsewd stsewd left a comment

Choose a reason for hiding this comment

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

Just a few details, this should be ready for merge after that.

readthedocs/doc_builder/exceptions.py Outdated Show resolved Hide resolved
readthedocs/rtd_tests/tests/test_doc_builder.py Outdated Show resolved Hide resolved
@saadmk11
Copy link
Member Author

@stsewd Updated the PR :)

Copy link
Member

@stsewd stsewd left a comment

Choose a reason for hiding this comment

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

Thanks!

readthedocs/rtd_tests/tests/test_doc_builder.py Outdated Show resolved Hide resolved
@stsewd stsewd requested a review from a team May 13, 2019 20:39
Copy link
Member

@humitos humitos left a comment

Choose a reason for hiding this comment

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

Thanks! Changes look good to me.

I'm a little worried about current projects that are building properly,

  • without a conf.py file
  • with a README file instead of a index.rst

What is our plan for those projects?

I'm marking as "Request changes" because of this reason to discuss what we want to do with those projects before merging it.

readthedocs/doc_builder/backends/sphinx.py Outdated Show resolved Hide resolved
@@ -76,3 +76,7 @@ class MkDocsYAMLParseError(BuildEnvironmentError):
'The "{config}" config from your MkDocs YAML config file has to be a '
'a list of relative paths.',
)
NOT_FOUND = ugettext_noop(
'A configuration file was not found. '
'Make sure you have a "mkdocs.yaml" file in your repository.',
Copy link
Member

Choose a reason for hiding this comment

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

Not sure if it matters, but official MkDocs uses mkdocs.yml to refer this file. I suppose it's better to follow their convention here.

Copy link
Member Author

Choose a reason for hiding this comment

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

@humitos Fixed. :)

@stsewd
Copy link
Member

stsewd commented May 14, 2019

What is our plan for those projects?

@humitos It was decided that if those project don't build locally, they shouldn't build in rtd neither. See #2483 (comment)

@humitos
Copy link
Member

humitos commented May 14, 2019

@stsewd I think that is valid for new projects, but I don't think we want to break all the ones that are already building properly. Also, that seems like a comment from David to me, not a decision made.

Do we know how many projects that matches the conditions that I mentioned are currently building? I suppose that at least we should contact them and make a deprecation plan giving them some time to migrate.

@humitos humitos added the Needed: design decision A core team decision is required label May 20, 2019
@humitos
Copy link
Member

humitos commented May 30, 2019

We decided that,

  1. we want to log.info the projects that are using this these features
  2. communicate with them to help on the migration

Once we have collected this data and we gave some time to them to migrate, we can merge this PR. I'm marking as blocked until then.

@humitos humitos added Status: blocked Issue is blocked on another issue and removed Needed: design decision A core team decision is required labels May 30, 2019
stsewd added a commit to stsewd/readthedocs.org that referenced this pull request Jun 12, 2019
Before removing this, we want to collect some info
to communicate this change to users.
Related readthedocs#5609
@humitos
Copy link
Member

humitos commented Jul 4, 2023

We are ready to move forward with the plan I wrote in my previous comment #5609 (comment)

So, the first step here is to add log lines to know what are the projects where we are creating a conf.py or a mkdocs.yaml file. It seems we already have this in place:

It seems we are ready to start contacting these users about the removal of this feature.

@humitos humitos removed the Status: blocked Issue is blocked on another issue label Jul 4, 2023
@humitos humitos requested a review from a team as a code owner July 11, 2023 14:33
@humitos humitos self-requested a review July 11, 2023 14:33
@humitos humitos requested a review from stsewd July 11, 2023 14:53
@humitos humitos dismissed their stale review July 11, 2023 14:53

I updated the PR with the latest changes

@ericholscher
Copy link
Member

@humitos This needs to be merged after Aug 28 right?

@humitos humitos added the Status: blocked Issue is blocked on another issue label Jul 12, 2023
@humitos
Copy link
Member

humitos commented Jul 12, 2023

@ericholscher
Copy link
Member

@humitos Great, I've added it to the sprint for that timeframe 👍

readthedocs/doc_builder/backends/sphinx.py Outdated Show resolved Hide resolved
readthedocs/doc_builder/backends/sphinx.py Outdated Show resolved Hide resolved
@humitos humitos merged commit 97b3b25 into readthedocs:main Aug 22, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: blocked Issue is blocked on another issue
Projects
Archived in project
4 participants