Merge branch 'gramps-project:master' into resource_path

.github/workflows/black.yml

@@ -6,5 +6,5 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: psf/black@stable

.github/workflows/gramps-ci.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install dependencies
       run: |
         sudo apt-get update

.github/workflows/windows-aio.yml

@@ -30,7 +30,7 @@ jobs:
         shell: msys2 {0}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: msys2/setup-msys2@v2
       with:
         msystem: MINGW64
@@ -39,7 +39,7 @@ jobs:
       run: |
         cd aio
         ./build.sh
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: GrampsAIO
         path: D:\a\gramps\gramps\aio\mingw64\src\GrampsAIO-*.exe

README.md

@@ -73,6 +73,12 @@ The following packages are **STRONGLY RECOMMENDED** to be installed:
 
   Used by Graphviz reports to help create PDF files.
 
+* **python-imagesize**
+
+ Provides better image processing performance. If this module is not available,
+ we continue to use Gdk. This provides a real improvement when we need to
+ process many big images.
+
 The following packages are optional:
 ------------------------------------
 * **gspell**
@@ -121,24 +127,6 @@ The following packages are optional:
  Python bindings of fontconfig are required for displaying
  genealogical symbols
 
-* **magic**
-
- Python magic bindings required to have better performances with image
- processing.
- If this module is not available, we continue to use Gdk.
- This avoid to load the image in memory. This is a real improvement
- when we have many big images.
- Used in odfdoc, rtfdoc and webreport and tested with png, gif, jpeg, bmp, tiff
- #
- #            file size     with magic  without (Gdk)   ratio
- # example 1 :     256k        0.00080        0.00575       7
- # example 2 :      21M        0.00171        0.55860     326
-
- Debian, Ubuntu, ... : python3-magic
- Fedora, Redhat, ... : python3-magic
- openSUSE            : python-magic
- ArchLinux           : python-magic
-
 Optional packages required by Third-party Addons
 ------------------------------------------------
 

aio/grampsaioc.py

@@ -16,7 +16,7 @@
     environ["G_ENABLE_DIAGNOSTIC"] = "0"
     environ["G_PARAM_DEPRECATED"] = "0"
     environ["GRAMPS_RESOURCES"] = join(aio, "share")
-    environ["PATH"] = aio + ";" + aio + "\lib;" + environ["PATH"]
+    environ["PATH"] = aio + ";" + aio + "\\lib;" + environ["PATH"]
 
 
 def close():

aio/grampsaiocd.py

@@ -17,7 +17,7 @@
     environ["G_ENABLE_DIAGNOSTIC"] = "0"
     environ["G_PARAM_DEPRECATED"] = "0"
     environ["GRAMPS_RESOURCES"] = join(aio, "share")
-    environ["PATH"] = aio + ";" + aio + "\lib;" + environ["PATH"]
+    environ["PATH"] = aio + ";" + aio + "\\lib;" + environ["PATH"]
 
 import gramps.grampsapp as app
 

aio/grampsaiow.py

@@ -18,7 +18,7 @@
     environ["G_ENABLE_DIAGNOSTIC"] = "0"
     environ["G_PARAM_DEPRECATED"] = "0"
     environ["GRAMPS_RESOURCES"] = join(aio, "share")
-    environ["PATH"] = aio + ";" + aio + "\lib;" + environ["PATH"]
+    environ["PATH"] = aio + ";" + aio + "\\lib;" + environ["PATH"]
 
 import atexit
 import ctypes

aio/setup.py

@@ -2,6 +2,7 @@
  Use with:
  python3 setup.py build_exe --no-compress -O1
 """
+
 import sys
 import os
 import site

data/man/en.rst

@@ -221,7 +221,7 @@ To explicitly specify the formats in the above example, append filenames with
 appropriate **-f** options::
 
     gramps -i file1.ged -f gedcom -i file2.tgz -f gramps-pkg \
-    -i ~/db3.gramps -f gramps-xml -i file4.wft -f wft -a check
+    -i ~/db3.gramps -f gramps -i file4.wft -f wft -a check
 
 To record the database resulting from all imports, supply a **-e** flag (use
 **-f** if the filename does not allow gramps to guess the format)::