Sync gramps@master with upstream/gramps-project (2026-07-07)

Author: github-actions[bot]

.github/workflows/gramps-ci.yml

@@ -60,11 +60,11 @@ jobs:
         python3 -m pip install virtualenv
     - name: Install addons
       run: |
-        mkdir -p ~/.local/share/gramps/gramps60/plugins/
-        wget https://github.com/gramps-project/addons/raw/master/gramps60/download/CliMerge.addon.tgz
-        tar -C ~/.local/share/gramps/gramps60/plugins/ -xzf CliMerge.addon.tgz
-        wget https://github.com/gramps-project/addons/raw/master/gramps60/download/ExportRaw.addon.tgz
-        tar -C ~/.local/share/gramps/gramps60/plugins/ -xzf ExportRaw.addon.tgz
+        mkdir -p ~/.local/share/gramps/gramps61/plugins/
+        wget https://github.com/gramps-project/addons/raw/master/gramps61/download/CliMerge.addon.tgz
+        tar -C ~/.local/share/gramps/gramps61/plugins/ -xzf CliMerge.addon.tgz
+        wget https://github.com/gramps-project/addons/raw/master/gramps61/download/ExportRaw.addon.tgz
+        tar -C ~/.local/share/gramps/gramps61/plugins/ -xzf ExportRaw.addon.tgz
     - name: Build
       run: |
         python3 -m build --wheel
@@ -77,3 +77,28 @@ jobs:
         export GDK_BACKEND=-
         export GRAMPS_RESOURCES=build/share
         python3 -m unittest discover -p "*_test.py"
+    - name: POTFILES check
+      run: |
+        cd po
+        intltool-update -m
+        if [ -f "missing" ]; then
+          echo "ERROR - A new file is not listed in either POTFILES.in or POTFILES.skip";
+          exit 1;
+        fi
+
+  pypi-installer:
+    name: PyPI installer tests (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-22.04, windows-latest, macos-latest]
+    steps:
+    - uses: actions/checkout@v6
+    - uses: actions/setup-python@v5
+      with:
+        python-version: "3.12"
+    - name: Create minimal resource directory
+      run: python -c "import os, shutil; os.makedirs('build/share/gramps', exist_ok=True); shutil.copy('data/authors.xml', 'build/share/gramps/authors.xml')"
+    - name: Run PyPI installer tests
+      run: python -m unittest gramps.gen.utils.test.pypi_test -v

.github/workflows/windows-aio-pyinstaller.yml

@@ -49,8 +49,10 @@ jobs:
       run: |
         cd aio-pyinstaller
         ./build.sh ${{ inputs.cleanup }} ${{ inputs.build-number }}
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v6
       with:
         name: GrampsAIO-PyInstaller
         path: D:\a\gramps\gramps\aio-pyinstaller\dist\grampsaio\src\GrampsAIO-*.exe
+        if-no-files-found: error
+        compression-level: 0 # no compression
         retention-days: 7

.github/workflows/windows-aio.yml

@@ -43,14 +43,22 @@ jobs:
     - uses: actions/checkout@v6
     - uses: msys2/setup-msys2@v2
       with:
-        msystem: MINGW64
+        msystem: UCRT64
         update: true
     - name: Build
       run: |
         cd aio
         ./build.sh ${{ inputs.cleanup }} ${{ inputs.build-number }}
+    - name: Run unit test suite
+      if: ${{ ! inputs.cleanup }} # can only run unit tests if python venv was preserved
+      run: |
+        export GRAMPS_RESOURCES=build/share
+        source /tmp/grampspythonenv/bin/activate
+        python3 -m unittest discover -p "*_test.py"
     - uses: actions/upload-artifact@v6
       with:
         name: GrampsAIO
-        path: D:\a\gramps\gramps\aio\mingw64\src\GrampsAIO-*.exe
+        path: D:\a\gramps\gramps\aio\ucrt64\src\GrampsAIO-*.exe
+        if-no-files-found: error
+        compression-level: 0 # no compression
         retention-days: 7

.gitignore

@@ -11,9 +11,8 @@ docs/_build/
 
 # Gramps AIO build artifacts
 aio/grampsaio64.nsi
-aio/mingw-w64-x86_64-db-*.pkg.tar.xz
-aio/mingw64
-gramps.egg-info
+aio/ucrt64
+*.egg-info
 
 # Editing
 tags
@@ -36,4 +35,7 @@ ehthumbs.db
 .venv*/
 
 # coverage
-.coverage
+.coverage
+
+# Visual Studio Code
+.vscode/*

ChangeLog

@@ -1,3 +1,70 @@
+2026-04-21
+Version 6.1.0-beta1
+* Update translations: da, es, fr, hr, nl, pl, pt_PT, sk, sv, zh_CN.
+* Improve Windows AIO `README.md`.
+* Skip bsddb tests on Windows.
+* Run unit test suite in AIO pipeline.
+* Call `self.close()` for ":memory:" DBs to avoid warnings.
+* Close database in `tearDownClass` method.
+* Avoid hard-coded paths and close the db at the end of the test.
+* Refactor media path tests to ensure environment restoration and database
+  closure.
+* Skip tests which are locale dependent when the correct locale is not selected.
+* When running unittests make the environment invariant of the current users
+  configuration.
+* Fix some translated strings.
+* Remove mingw64 entry from gitignore.
+* Fix local Windows AIO build.
+* Migrate Windows AIO to MSYS2 UCRT64 environment. Fixes #14149.
+* Replace hexlify with `getSortKey()` bytes, drop binascii import. Bug #10077.
+* Add config to allow ignore XML media flag.
+* Implement FamilySearch-Gramps Integration.
+* Pass an object rather than a handle to the note editor callback.
+  Fixes #13702, #13884.
+* Add a HasNoteTag filter rule.
+* Add HasNoteType filters for Media and Repository objects.
+* Add a "References" tab to the family editor dialog. Fixes #13673.
+* Avoid opening a Citation when dragging or selecting an existing one.
+* Improve birth/death estimation.
+* Update the `INSTALL` file.
+* Add `tearDownClass` method to cleaup after unit test.
+* Fix ProbablyAlive ignoring fallback when birth event has no year.
+* Add non-sharable notes to media. Fixes #13922.
+* Add a favorites sidebar and all persistent sidebar.
+* Narrative web: Add an option to allow internet indexing.
+* Allow invalid dates in the relationship graph. Fixes #13672.
+* Calendar enhancements. Fixes #13754.
+* Add an Address option to the Individual Complete Report. Implements #14170.
+* Remove duplicated name formats.
+* Small one-line fixes mainly to comments and log messages.
+* Change the default gramps IDs to %05d.
+* Tidy up the add_row method in the PlaceDetails gramplet.
+* Move embedded URLs out of translated strings.
+* Add `AGENTS.md` with contributor and agent guidelines.
+* Update minimum python version. Python 3.9 reached EOL in October 2025.
+* Remove out of date comments.
+* Maintain compatibility with the directories used by Gramps 6.0.
+* Fix home directory location on Windows.
+* When writing a gramps XML file use the NS URI not the homepage URL.
+* Update http://developers.gramps-project.org.
+* Use https instead of http.
+* Fix spelling mistake in comment.
+* Fix code formatting.
+* Convert Windows AIO to use the new build process.
+* Provide a fallback for locale module without gettext support.
+* Decouple the core library code from GObject introspection.
+* Fix license issues in the `pyproject.toml` file.
+* Fix test path.
+* Dev version correctly reports the SHA of the local HEAD commit.
+* Rename apply to apply_to_one to reflect global change in v6.0.
+* Code improvements.
+* Unrelated formatting fixes.
+* Fix test directory location in unit tests.
+* Convert to using a `pyproject.toml` based build system.
+* Add a configuration option for the length of note previews.
+* Add mypy configuration.
+* Add `py.typed` to indicate the code base is (becoming) typed.
+
 2026-04-09
 Version 6.0.8
 * Update translations: cs, de_AT, en_GB, fa, fi, fr, ga, he, hr, it, mn, nl, pl,

NEWS

@@ -1,34 +1,101 @@
 The files in this directory are used to build the Gramps Windows AIO (All In One) installer.
 
-To build AIO for the master branch :
+# Build AIO for the master branch
 
 1. Install MSYS2
-    * Download MSYS2 from <https://www.msys2.org/> .
-    * Install with default options. 
-    * From the Start menu, run "MSYS2 MINGW64"
-    * Upgrade system : ` pacman -Syuu --noconfirm `  (twice if the first run closes msys2).
+    1. Download MSYS2 from <https://www.msys2.org/>.
+    2. Install with the default options.
+    3. From the Start menu, run "MSYS2 UCRT64".
+    4. Upgrade system
+     
+        ```bash
+        pacman -Syuu --noconfirm
+        ```
+        Run this command a second time, if the first run automatically closes MSYS2.
 
 2. Install Git, if not already installed
-```
-pacman -S git --noconfirm
-```
+    
+    ```bash
+    pacman -S git --noconfirm
+    ```
 
 3. Download Gramps sources from github :
 
-```
-git clone https://github.com/gramps-project/gramps.git
-```
+    ```bash
+    git clone https://github.com/gramps-project/gramps.git
+    ```
 
 4. Build AIO :
 
-```
-cd gramps/aio
-./build.sh
-```
+    ```bash
+    cd gramps/aio
+    ./build.sh
+    ```
 To capture the full output of the build, use `./build.sh >& build_log.txt`
 
-The resulting AIO installer is in `gramps/aio/mingw64/src/GrampsAIO-[appversion]-[appbuild]-[hash]_win64.exe`
+The resulting AIO installer is in the directory `gramps/aio/ucrt64/src/GrampsAIO-[appversion]-[appbuild]-[hash]_win64.exe`
 
 The python virtual environment created during build (`c:\msys64\tmp\grampspythonenv\bin\python.exe` by default) can then be configured in Visual Studio Code and used to debug etc.
 
-To delete the python virtual environment at the end of the build, call ```./build.sh true```. This can be useful when testing the build script.
+To delete the python virtual environment at the end of the build, call ```./build.sh true```. This can be useful when testing the build script.
+
+# Useful Tips
+Tips for developing Gramps on Windows with Visual Studio code.
+
+All tips assume that you have built AIO. All commands should be run from the root directory of the Gramps source tree, unless stated otherwise.
+
+1. Add an MSYS2 terminal option to Visual Studio Code
+
+    This allows you to create an MSYS2 terminal within VSCode
+
+    1. In Visual Studio Code, press Ctrl+Shift+P.
+    2. Search for Preferences: Open Settings (JSON) and select it.
+    3. Add the following text
+        ```json
+        "terminal.integrated.profiles.windows": {
+            "MSYS2 UCRT64": {
+                "path": "C:\\msys64\\usr\\bin\\bash.exe",
+                "args": [
+                    "--login",
+                    "-i"
+                ],
+                "env": {
+                    "MSYSTEM": "URCT64",
+                    "CHERE_INVOKING": "1"
+                }
+            }
+        }
+        ```
+        Note: If the `terminal.integrated.profiles.windows` attribute already exists, you will need to manually merge the above entry.
+2. Activate python
+    
+    Gramps requires several python packages to run. The easiest way to ge the correct configuration is to reuse the python venv created when building AIO. To activate the python venv created during the AIO build process, run
+
+    ```bash 
+    source /tmp/grampspythonenv/bin/activate
+    ```
+
+    Tip: You can usually build AIO once and use this venv repeatedly. There is no need to build every time you change the code. This does not apply if you switch between gramps versions e.g. master to gramps60 or are changing gramps dependencies.
+3. Run `mypy` locally
+    1. Install mypy and type-requests: `python3 -m pip install mypy types-requests`
+    2. Run mypy: `mypy`
+4. Run `black` locally
+    1. Install black to check all files: `python3 -m pip install black`
+    2. Run black to _check_ files: `black . --check`
+    3. Run black to _fix_ files: `black .`
+5. Run unit tests locally
+    1. Run all unit tests
+
+        ```bash
+        LANGUAGE= LANG=en_US.utf-8 GRAMPS_RESOURCES=. python -m unittest discover -p '*_test.py'
+        ```
+    2. Run an individual unit test
+
+        In this example, only the `gramps.plugins.test.reports_test.TestDynamic` tests are run
+
+        ```bash
+        LANGUAGE= LANG=en_US.utf-8 GRAMPS_RESOURCES=. python -m unittest gramps.plugins.test.reports_test.TestDynamic
+        ```
+    
+    Note: a small number of unit tests are skipped when run on Windows
+