[Git][debian-gis-team/satpy][master] 3 commits: New 0007-No-area_def_list.patch

Antonio Valentino (@antonio.valentino) gitlab at salsa.debian.org
Wed Jul 31 22:33:54 BST 2024



Antonio Valentino pushed to branch master at Debian GIS Project / satpy


Commits:
23653b6b by Antonio Valentino at 2024-07-31T20:13:28+00:00
New 0007-No-area_def_list.patch

- - - - -
b271d8f0 by Antonio Valentino at 2024-07-31T20:17:25+00:00
Fix doc build.

- - - - -
10b4f68b by Antonio Valentino at 2024-07-31T21:08:47+00:00
Fix d/clean

- - - - -


6 changed files:

- + debian/area_def_list.rst
- debian/changelog
- debian/clean
- + debian/patches/0007-No-area_def_list.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/area_def_list.rst
=====================================
The diff for this file was not included because it is too large.

=====================================
debian/changelog
=====================================
@@ -11,8 +11,10 @@ satpy (0.50.0-1) unstable; urgency=medium
     - Drop 0007-Fix-gcps-type-for-newer-rioxarray-versions.patch,
       applied upstream.
     - Refresh and renumber remaining patches.
+    - New 0007-No-area_def_list.patch.
   * New source/lintian-overrides file for silencing misdetection of uuid
     as deprecated stdlib.
+  * Fix doc build.
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Wed, 31 Jul 2024 05:58:49 +0000
 


=====================================
debian/clean
=====================================
@@ -1,7 +1,8 @@
 .eggs
 .pytest_cache/
 *-info/
-doc/source/api/
+doc/source/api/*
+doc/source/area_def_list.rst
 doc/source/reader_table.rst
 satpy/version.py
 test*.mitiff


=====================================
debian/patches/0007-No-area_def_list.patch
=====================================
@@ -0,0 +1,56 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Wed, 31 Jul 2024 20:11:26 +0000
+Subject: No area_def_list
+
+Forwarded: not-needed
+---
+ doc/source/conf.py | 36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 4443e82..382cde3 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -87,24 +87,24 @@ with open("reader_table.rst", mode="w") as f:
+     f.write(generate_reader_table())
+ 
+ # create table from area definition yaml file
+-area_file = get_area_file()[0]
+-
+-area_dict = _read_yaml_area_file_content(area_file)
+-area_table = [rst_table_header("Area Definitions", header=["Name", "Description", "Projection"],
+-                               widths="auto", class_name="area-table")]
+-
+-for aname, params in area_dict.items():
+-    area = _create_area_def_from_dict(aname, params)
+-    if not hasattr(area, "_repr_html_"):
+-        continue
+-
+-    area_table.append(rst_table_row([f"`{aname}`_", area.description,
+-                                     area.proj_dict.get("proj")]))
+-
+-with open("area_def_list.rst", mode="w") as f:
+-    f.write("".join(area_table))
+-    f.write("\n\n")
+-    f.write(generate_area_def_rst_list(area_file))
++# area_file = get_area_file()[0]
++#
++# area_dict = _read_yaml_area_file_content(area_file)
++# area_table = [rst_table_header("Area Definitions", header=["Name", "Description", "Projection"],
++#                                widths="auto", class_name="area-table")]
++#
++# for aname, params in area_dict.items():
++#     area = _create_area_def_from_dict(aname, params)
++#     if not hasattr(area, "_repr_html_"):
++#         continue
++#
++#     area_table.append(rst_table_row([f"`{aname}`_", area.description,
++#                                      area.proj_dict.get("proj")]))
++#
++# with open("area_def_list.rst", mode="w") as f:
++#     f.write("".join(area_table))
++#     f.write("\n\n")
++#     f.write(generate_area_def_rst_list(area_file))
+ 
+ # -- General configuration -----------------------------------------------------
+ 


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@
 0004-Fix-privacy-breach.patch
 0005-Fix-compatibility-with-old-dask-versions.patch
 0006-Do-not-document-pvivate-members.patch
+0007-No-area_def_list.patch


=====================================
debian/rules
=====================================
@@ -75,6 +75,7 @@ execute_after_dh_auto_build-indep: export http_proxy=127.0.0.1:9
 execute_after_dh_auto_build-indep: export https_proxy=127.0.0.1:9
 execute_after_dh_auto_build-indep:
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
+	cp debian/area_def_list.rst doc/source
 	PSP_CONFIG_FILE=$(CURDIR)/debian/pyspectral_dummycfg.yaml \
 	PYTHONPATH={build_dir} \
 	python3 -m sphinx -N -E -T -b html doc/source $(CURDIR)/.pybuild/docs/html



View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/4b27b63095b6820f65befae3354fc0223dc131ec...10b4f68b171d6a29508548e8b936b22530f2d246

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/-/compare/4b27b63095b6820f65befae3354fc0223dc131ec...10b4f68b171d6a29508548e8b936b22530f2d246
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240731/20e40406/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list