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

Bump sphinx from 4.2.0 to 7.2.6 in /docs (+ all dependencies) and fix errors/warnings #5008

Merged
merged 5 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2773,7 +2773,7 @@ https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#host
* pyldd: disambiguate java .class files from Mach-O fat files (same magic number) #2328
* fix hash regex for downloaded files in `src_cache` #2330
* fix `zip_keys` becoming a loop dimension when variants passed as object rather than loaded from file #2333
* fix windows always warning about old compiler activation. Now only warns if {{ compiler() }} is not used. #2333
* fix windows always warning about old compiler activation. Now only warns if `{{ compiler() }}` is not used. #2333
* Add `LD_RUN_PATH` back into Linux variables for now (may remove later, but will have deprecation cycle) #2334

### Contributors
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SHELL := /bin/bash -o pipefail -o errexit
# ENV_NAME=dev TMPDIR=$HOME make test
ENV_NAME ?= conda-build
DOC_ENV_NAME ?= conda-build-docs
PYTHON_VERSION ?= 3.8
PYTHON_VERSION ?= 3.11
TMPDIR := $(shell if test -w $(TMPDIR); then echo $(TMPDIR); else echo ./tmp/ ; fi)conda-build-testing

# We want to bypass the shell wrapper function and use the binary directly for conda-run specifically
Expand Down
30 changes: 15 additions & 15 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
linkify-it-py==1.0.1
myst-parser==0.15.2
Pillow==9.3.0
linkify-it-py==2.0.2
myst-parser==2.0.0
Pillow==10.0.1
PyYAML==6.0.1
requests==2.31.0
ruamel.yaml==0.17.16
Sphinx==4.2.0
sphinx-argparse==0.3.1
ruamel.yaml==0.17.32
Sphinx==7.2.6
sphinx-argparse==0.4.0
sphinx-autobuild==2021.3.14
sphinx-rtd-theme==1.0.0
sphinx-sitemap==2.2.0
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==2.0.0
sphinx-rtd-theme==1.3.0
sphinx-sitemap==2.5.1
sphinxcontrib-applehelp==1.0.7
sphinxcontrib-devhelp==1.0.5
sphinxcontrib-htmlhelp==2.0.4
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-plantuml==0.21
sphinxcontrib-plantuml==0.26
sphinxcontrib-programoutput==0.17
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
pylint==2.11.1
sphinxcontrib-qthelp==1.0.6
sphinxcontrib-serializinghtml==1.1.9
pylint==2.17.5
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = "en"

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down Expand Up @@ -206,7 +206,7 @@
# -- Options for intersphinx extension ---------------------------------------

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {"https://docs.python.org/": None}
intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}

# -- Options for todo extension ----------------------------------------------

Expand Down