diff --git a/docs/source/conf.py b/docs/source/conf.py index 31dfa1240..dcccde41e 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -206,10 +206,9 @@ epub_exclude_files = ['search.html'] # -- Intersphinx configuration ------------------------------------------------ intersphinx_mapping = { - 'python': ('https://docs.python.org/3.5', None), - 'pyUbmbral': ('http://pyumbral.readthedocs.io/en/latest/', None), - 'web3py': ('https://web3py.readthedocs.io/en/latest/', None), - + "python": ("https://docs.python.org/3.8", None), + "pyUbmbral": ("http://pyumbral.readthedocs.io/en/latest/", None), + "web3py": ("https://web3py.readthedocs.io/en/latest/", None), } # -- Autodoc configuration ---------------------------------------- diff --git a/readthedocs.yml b/readthedocs.yml index 1a2f44805..9a78a2c31 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -8,18 +8,16 @@ version: 2 sphinx: configuration: docs/source/conf.py +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.8" + # Optionally build your docs in additional formats such as PDF and ePub formats: all -# Optionally set the version of Python and requirements required to build your docs +# Optionally set the requirements required to build your docs python: - version: "3.7" install: - - method: pip - path: . - extra_requirements: - - docs - requirements: docs-requirements.txt - -build: - image: latest diff --git a/setup.py b/setup.py index c9d518520..5cc04e681 100644 --- a/setup.py +++ b/setup.py @@ -117,8 +117,9 @@ def read_requirements(path): return requirements -INSTALL_REQUIRES = read_requirements('requirements.txt') -DEV_REQUIRES = read_requirements('dev-requirements.txt') +INSTALL_REQUIRES = read_requirements("requirements.txt") +DEV_REQUIRES = read_requirements("dev-requirements.txt") +DOC_REQUIRES = read_requirements("docs-requirements.txt") BENCHMARK_REQUIRES = [ 'pytest-benchmark' @@ -136,10 +137,11 @@ URSULA_REQUIRES = ['prometheus_client', 'sentry-sdk'] # TODO: Consider renaming EXTRAS = { # Admin - 'dev': DEV_REQUIRES + URSULA_REQUIRES, - 'benchmark': DEV_REQUIRES + BENCHMARK_REQUIRES, - 'deploy': DEPLOY_REQUIRES, - 'ursula': URSULA_REQUIRES, + "dev": DEV_REQUIRES + URSULA_REQUIRES, + "benchmark": DEV_REQUIRES + BENCHMARK_REQUIRES, + "deploy": DEPLOY_REQUIRES, + "ursula": URSULA_REQUIRES, + "docs": DOC_REQUIRES, }