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

Adjust the RTD dependencies for old sphinx version #388

Merged
merged 1 commit into from
Jan 10, 2023

Conversation

mbeacom
Copy link
Contributor

@mbeacom mbeacom commented Jan 10, 2023

Issue #, if available: #386

Description of changes: The goal of this PR is to resolve the RTD build failures (similar to here: https://readthedocs.org/projects/aws-config-rdk/builds/19116212/) -- the encountered failure is described here: readthedocs/readthedocs.org#9037

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@mbeacom mbeacom self-assigned this Jan 10, 2023
@mbeacom
Copy link
Contributor Author

mbeacom commented Jan 10, 2023

@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is superfluous in python 3 as source files are decoded as utf-8 by default.

@@ -23,7 +21,7 @@
# -- Project information -----------------------------------------------------

project = "RDK"
copyright = "2017-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved"
copyright = "2017-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We likely shouldn't be maintaining a range, but rather the original year of copyright per OSS guidance. That said, since we're maintaining a range already, updating it to show we're still maintaining the project :D

@@ -3,4 +3,4 @@ sphinx-argparse==0.2.5
sphinx-rtd-theme==0.4.3
sphinxcontrib-websupport==1.1.0
PyYAML==5.4.1

jinja2<3.1.0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the specific dep pinning defined in the attached issues remediation steps.

Copy link
Contributor

@rickychau2780 rickychau2780 left a comment

Choose a reason for hiding this comment

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

lgtm

@mbeacom mbeacom merged commit 9f2c026 into awslabs:master Jan 10, 2023
@mbeacom mbeacom deleted the fix-rtd branch January 10, 2023 14:38
@mbeacom mbeacom mentioned this pull request Jan 20, 2023
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.

2 participants