Просмотр исходного кода

Merge branch 'bugfix/doc_cairo2svg_version' into 'master'

docs: bump cairosvg from 2.4.2 to 2.5.1 in /docs

Closes IDFGH-4546

See merge request espressif/esp-idf!11894
Angus Gratton 5 лет назад
Родитель
Сommit
f0cfbc32c2
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      .gitlab-ci.yml
  2. 1 1
      docs/requirements.txt

+ 1 - 1
.gitlab-ci.yml

@@ -63,7 +63,7 @@ variables:
   CI_AUTO_TEST_SCRIPT_REPO_BRANCH: "ci/v3.1"
 
   # Versioned esp-idf-doc env image to use for all document building jobs
-  ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v7"
+  ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v8"
 
 .setup_tools_unless_target_test: &setup_tools_unless_target_test |
   if [[ -n "$IDF_DONT_USE_MIRRORS" ]]; then

+ 1 - 1
docs/requirements.txt

@@ -4,7 +4,7 @@
 # matplotlib is currently required only by the script generate_chart.py
 matplotlib==3.3.1 ; python_version>="3"
 matplotlib==2.0.1 ; python_version=="2.7"
-cairosvg==2.4.2 # required by sphinxcontrib-svg2pdfconverter[CairoSVG]
+cairosvg==2.5.1 # required by sphinxcontrib-svg2pdfconverter[CairoSVG]
 sphinx==2.3.1
 breathe==4.14.1
 sphinx-copybutton==0.3.0