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

Remove logic around finding config file inside directories #4755

Merged
merged 7 commits into from Oct 30, 2018

Conversation

@sriks123
Copy link
Contributor

@sriks123 sriks123 commented Oct 13, 2018

Fixes issue #4669

@sriks123 sriks123 changed the title Fixes issue #4669 Remove logic around finding config file inside directories Oct 13, 2018
@sriks123
Copy link
Contributor Author

@sriks123 sriks123 commented Oct 13, 2018

Hi @stsewd can you please review this?

@stsewd
Copy link
Member

@stsewd stsewd commented Oct 15, 2018

@sriks123 any reason why you closed #4714?

Copy link
Member

@stsewd stsewd left a comment

We can simplify the test a little more

])
def test_load_no_config_file(tmpdir, files):
def test_load_no_config_file(tmpdir, files, nested_files):
Copy link
Member

@stsewd stsewd Oct 15, 2018

We don't need another variable here, adding the new tests to files is enough

apply_fs(tmpdir, nested_files)
with raises(ConfigError) as ae:
load(base, env_config)
assert ae.value.code == CONFIG_REQUIRED
Copy link
Member

@stsewd stsewd Oct 15, 2018

If we use the same variable we don't need to duplicate this

@sriks123
Copy link
Contributor Author

@sriks123 sriks123 commented Oct 15, 2018

@stsewd I closed #4714 due to some problems in that branch which I created

stsewd
stsewd approved these changes Oct 15, 2018
Copy link
Member

@stsewd stsewd left a comment

LGTM, thanks

@sriks123
Copy link
Contributor Author

@sriks123 sriks123 commented Oct 15, 2018

@stsewd thanks

@stsewd
Copy link
Member

@stsewd stsewd commented Oct 23, 2018

@agjohnson can we merge this?

@RichardLitt RichardLitt requested a review from agjohnson Oct 24, 2018
@ericholscher
Copy link
Member

@ericholscher ericholscher commented Oct 30, 2018

Looks good. 👍

@ericholscher ericholscher merged commit a803581 into readthedocs:master Oct 30, 2018
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants