Skip to content

Commit

Permalink
Update QGIS and PyQGIS to 3.38.1 (#5084)
Browse files Browse the repository at this point in the history
* Update QGIS to 3.38.1

* Update PyQGIS to 3.38.1
  • Loading branch information
Djedouas authored Aug 10, 2024
1 parent 3e7b909 commit 87f75d3
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
5 changes: 3 additions & 2 deletions docsets/PyQGIS/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
QGIS
PyQGIS
=======================

## Author

This docset is maintained by [Julien Cabieces](https://github.com/troopa81) and [Antoine Facchini](https://github.com/Koyaani)
This docset is maintained by [Julien Cabieces](https://github.com/troopa81) and [Jacky Volpes](https://github.com/Djedouas)

## Building

Expand All @@ -17,6 +17,7 @@ Build it
mkdir build
cd build
cmake ../ -DWITH_3D=TRUE -DWITH_SERVER=TRUE
make
```

Then, clone PyQGIS
Expand Down
2 changes: 1 addition & 1 deletion docsets/PyQGIS/docset.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "PyQGIS",
"version": "3.36.1",
"version": "3.38.1",
"archive": "PyQGIS.tgz",
"author": {
"name": "Jacky Volpes",
Expand Down
31 changes: 15 additions & 16 deletions docsets/PyQGIS/pyqgis.patch
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
diff --git a/conf.py.in b/conf.py.in
index 486f489..3239f58 100644
--- a/conf.py.in
+++ b/conf.py.in
@@ -3,8 +3,6 @@
import sys, os
import yaml
diff --git a/conf.in.py b/conf.in.py
index 6515474..b550ab5 100644
--- a/conf.in.py
+++ b/conf.in.py
@@ -1,7 +1,6 @@
import os
import sys

-import sphinx_rtd_theme
-
import yaml

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -65,8 +63,7 @@ pygments_style = 'sphinx'
@@ -73,8 +72,7 @@ pygments_style = "sphinx"

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
-html_theme = 'sphinx_rtd_theme'
-html_theme = "sphinx_rtd_theme"
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # use with module import
+html_theme = 'python_docs_theme'

# html_theme_path = ['.'] # use with git submodule

@@ -81,6 +78,7 @@ html_theme_options = {
'titles_only': True,
'versioning': True,
'canonical_url': 'https://qgis.org/pyqgis/latest',
+ 'nosidebar': True
@@ -89,6 +87,7 @@ html_theme_options = {
"titles_only": True,
"versioning": True,
"canonical_url": "https://qgis.org/pyqgis/latest",
+ "nosidebar": True
}

# Add any paths that contain custom themes here, relative to this directory.
2 changes: 1 addition & 1 deletion docsets/QGIS/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ QGIS

## Author

This docset is maintained by [Julien Cabieces](https://github.com/troopa81) and [Antoine Facchini](https://github.com/Koyaani)
This docset is maintained by [Julien Cabieces](https://github.com/troopa81) and [Jacky Volpes](https://github.com/Djedouas)

## Building

Expand Down
2 changes: 1 addition & 1 deletion docsets/QGIS/docset.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "QGIS",
"version": "3.36.1",
"version": "3.38.1",
"archive": "QGIS.tgz",
"author": {
"name": "Jacky Volpes",
Expand Down

0 comments on commit 87f75d3

Please sign in to comment.