Skip to content

New config for new docker build images #8478

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

Merged
merged 13 commits into from
Sep 21, 2021
Merged

New config for new docker build images #8478

merged 13 commits into from
Sep 21, 2021

Conversation

stsewd
Copy link
Member

@stsewd stsewd commented Sep 9, 2021

Docs need to be updated, but I'm not doing that here, since this isn't implemented yet.

Required by #8453

@stsewd stsewd force-pushed the docker-image-config branch 7 times, most recently from 013e943 to 4b4cdb1 Compare September 13, 2021 19:15
@stsewd stsewd force-pushed the docker-image-config branch from 4b4cdb1 to 4251717 Compare September 13, 2021 19:26
@stsewd stsewd requested a review from humitos September 13, 2021 21:47
@stsewd stsewd marked this pull request as ready for review September 13, 2021 21:47
Comment on lines +555 to +557
# Always point to the latest stable release.
RTD_DOCKER_BUILD_SETTINGS['tools']['python']['3'] = RTD_DOCKER_BUILD_SETTINGS['tools']['python']['3.9']

Copy link
Member

Choose a reason for hiding this comment

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

If we want to offer this as a feature, we should document it as well. Otherwise, build specifying python: 3 may start failing once we upgrade to 3.10 and will blame us.

Copy link
Member Author

Choose a reason for hiding this comment

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

I added it because a couple of users wanted this feature back, we changed it to be pinned to a specific version, but that is more confusing, as users expect it to always point to the latest version available on purpose.

'3.9': '3.9.7',
'3.10': '3.10.0rc2',
'pypy3.7': 'pypy3.7-7.3.5',
'miniconda3-4.7': 'miniconda3-4.7.12',
Copy link
Member

Choose a reason for hiding this comment

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

I found this problem while testing this: pyenv/pyenv#2070

I'm not sure what to do yet, one option is to patch pyenv to not install pip after installing miniconda.

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.

Looks good to me! As far as I can tell, all the features in the config file required to use the new Docker images are already implemented.

The only place where I'd like to have someone's else feedback is on the build.os being ubuntu20 or ubuntu-20.04 (see #8478 (comment) cc @ericholscher) because it differs from what we talked about in the document --but I don't have a strong opinion on this.

@stsewd stsewd enabled auto-merge (squash) September 21, 2021 16:21
@stsewd stsewd merged commit 2e1b121 into master Sep 21, 2021
@stsewd stsewd deleted the docker-image-config branch September 21, 2021 16:26
@astrojuanlu
Copy link
Contributor

I see that this PR updated the schema.json, but shouldn't we update the schema.yml as well? I noticed because the .yml is the one we link from our docs. cc @stsewd

@stsewd
Copy link
Member Author

stsewd commented Sep 30, 2021

I see that this PR updated the schema.json, but shouldn't we update the schema.yml as well? I noticed because the .yml is the one we link from our docs. cc @stsewd

I think we should link to the json schema, the one from yamale doesn't support a lot of things (we were using comments because of that).

@stsewd
Copy link
Member Author

stsewd commented Sep 30, 2021

https://github.com/Julian/jsonschema that looks like a good implementation of json scheme in python. We could even replace part of our config validation with that. But +1 on ditching yamale, we only use it here https://github.com/readthedocs/readthedocs.org/blob/master/readthedocs/rtd_tests/tests/test_build_config.py, but we don't use anything from yamale in production which is also weird having yamale only to test the spec we don't use.

@stsewd
Copy link
Member Author

stsewd commented Oct 1, 2021

Opened #8549

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants