From 54ac3ca0531ae829f16bb856315f54b8a25f36c2 Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Mon, 29 Jul 2024 10:10:10 +0200 Subject: [PATCH 1/6] Fix docs HTML build --- REQUIREMENTS.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index 9860f790a05..6d4b8ec1fae 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -1,4 +1,9 @@ -# Memo: Dependencies should be added to https://github.com/qgis/QGIS-Website/blob/master/REQUIREMENTS.txt -# Used for docker image builds - --r https://raw.githubusercontent.com/qgis/QGIS-Website/master/REQUIREMENTS.txt +pdflatex +pyYAML +Sphinx==7.2.6 +sphinx_copybutton +sphinx-intl +sphinx_rtd_theme +sphinx_togglebutton +sphinxext-rediraffe +# sphinxcontrib-jquery From f2e94c32d960c49bcb9af9ebba05f7229517b29e Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Wed, 31 Jul 2024 20:10:49 +0200 Subject: [PATCH 2/6] Load requirements from website repo --- REQUIREMENTS.txt | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index 6d4b8ec1fae..c51f98477bd 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -7,3 +7,27 @@ sphinx_rtd_theme sphinx_togglebutton sphinxext-rediraffe # sphinxcontrib-jquery +atoma==0.0.17 +attrs==22.2.0 +beautifulsoup4==4.11.1 +bs4==0.0.1 +certifi==2022.12.7 +charset-normalizer==2.1.1 +defusedxml==0.7.1 +exceptiongroup==1.1.0 +idna==3.4 +iniconfig==1.1.1 +lxml==4.9.2 +packaging==22.0 +pluggy==1.0.0 +pydantic==1.10.4 +pytest==7.2.0 +python-dateutil==2.8.2 +requests==2.28.1 +rss-parser==0.2.4 +six==1.16.0 +soupsieve==2.3.2.post1 +tomli==2.0.1 +typing_extensions==4.4.0 +urllib3==1.26.13 +icalendar==5.0.12 From 70a11548856e815c8f4a19fc1197dc3046201f15 Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Wed, 31 Jul 2024 20:13:50 +0200 Subject: [PATCH 3/6] Raise Sphinx version and loosen dependencies conflicts --- REQUIREMENTS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index c51f98477bd..18861fb25fb 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -1,6 +1,6 @@ pdflatex pyYAML -Sphinx==7.2.6 +Sphinx==7.4.6 sphinx_copybutton sphinx-intl sphinx_rtd_theme From 009ea64f68a7750f67337ee979c9384aec6e200c Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Wed, 31 Jul 2024 23:58:42 +0200 Subject: [PATCH 4/6] Align version for request and packaging dependencies and remove useless pdflatex --- REQUIREMENTS.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index 18861fb25fb..acbcc88336f 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -1,4 +1,3 @@ -pdflatex pyYAML Sphinx==7.4.6 sphinx_copybutton @@ -6,7 +5,6 @@ sphinx-intl sphinx_rtd_theme sphinx_togglebutton sphinxext-rediraffe -# sphinxcontrib-jquery atoma==0.0.17 attrs==22.2.0 beautifulsoup4==4.11.1 @@ -18,12 +16,12 @@ exceptiongroup==1.1.0 idna==3.4 iniconfig==1.1.1 lxml==4.9.2 -packaging==22.0 +packaging>=23.0 #==22.0 pluggy==1.0.0 pydantic==1.10.4 pytest==7.2.0 python-dateutil==2.8.2 -requests==2.28.1 +requests>=2.30.0 #==2.28.1 rss-parser==0.2.4 six==1.16.0 soupsieve==2.3.2.post1 From dd34e4b521b4574976e95170f91407c4b5182f54 Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Thu, 1 Aug 2024 00:36:39 +0200 Subject: [PATCH 5/6] Silence warnings --- conf.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf.py b/conf.py index 25e869fea4e..d5d9aa6e79c 100644 --- a/conf.py +++ b/conf.py @@ -243,6 +243,9 @@ def calculate_tx_slug(filepath): This page is currently translated at |translation progress|. """ +# A list of warning codes to suppress arbitrary warning messages. +suppress_warnings = ["config.cache"] + # -- Options for LaTeX output -------------------------------------------------- latex_engine = 'xelatex' From d9ff48dc305153ece4b45d35dda3fae6ff38befe Mon Sep 17 00:00:00 2001 From: Harrissou Sant-anna Date: Tue, 13 Aug 2024 07:18:55 +0000 Subject: [PATCH 6/6] Workaround the missing methods in pyQGIS docs --- docs/pyqgis_developer_cookbook/vector.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/pyqgis_developer_cookbook/vector.rst b/docs/pyqgis_developer_cookbook/vector.rst index 94207ac088a..a8a017ead46 100644 --- a/docs/pyqgis_developer_cookbook/vector.rst +++ b/docs/pyqgis_developer_cookbook/vector.rst @@ -409,8 +409,8 @@ explains how to do :ref:`modifications with editing buffer `. Add Features ------------ -Create some :class:`QgsFeature ` instances and pass a list of them to provider's -:meth:`addFeatures() ` method. It will return two values: +Create some :class:`QgsFeature ` instances and pass a list of them to the provider +:class:`QgsVectorDataProvider ` ``addFeatures()`` method. It will return two values: result (:const:`True` or :const:`False`) and list of added features (their ID is set by the data store). @@ -735,7 +735,7 @@ There are several ways to generate a vector layer dataset: call to :meth:`writeAsVectorFormatV3() ` which saves the whole vector layer or creating an instance of the class and issue calls to - :meth:`addFeature() `. This class + inherited :meth:`addFeature() `. This class supports all the vector formats that GDAL supports (GeoPackage, Shapefile, GeoJSON, KML and others). * the :class:`QgsVectorLayer ` class: instantiates