gramps-project · dave-khuon · Aug 3, 2023 · Aug 3, 2023 · Aug 3, 2023 · Aug 3, 2023
diff --git a/.github/workflows/gramps-ci.yml b/.github/workflows/gramps-ci.yml
@@ -21,9 +21,9 @@ name: Gramps CI
 
 on:
   push:
-    branches: [ maintenance/gramps52 ]
+    branches: [ master ]
   pull_request:
-    branches: [ maintenance/gramps52 ]
+    branches: [ master ]
 
 jobs:
   build:

diff --git a/.github/workflows/pypi-upload.yml b/.github/workflows/pypi-upload.yml
@@ -0,0 +1,18 @@
+name: PyPI upload
+
+on: workflow_dispatch
+
+jobs:
+  pypi-publish:
+    name: upload release to PyPI
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build package distributions
+        run: |
+          python3 setup.py sdist bdist_wheel
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/README.md b/README.md
@@ -120,6 +120,10 @@ The following packages are optional:
  Python bindings of fontconfig are required for displaying
  genealogical symbols
 
+* [**pycountry**](https://pypi.org/project/pycountry/)
+
+ Used to validate ISO language codes.
+
 
 Optional packages required by Third-party Addons
 ------------------------------------------------

diff --git a/aio/build.sh b/aio/build.sh
@@ -4,7 +4,41 @@
 #
 # install prerequisites
 ## prerequisites in msys packages
-pacman -S --needed --noconfirm mingw-w64-x86_64-python mingw-w64-x86_64-python-pip mingw-w64-x86_64-gexiv2 mingw-w64-x86_64-ghostscript mingw-w64-x86_64-python-cairo mingw-w64-x86_64-python-gobject mingw-w64-x86_64-python-icu mingw-w64-x86_64-iso-codes mingw-w64-x86_64-hunspell mingw-w64-x86_64-enchant perl-XML-Parser intltool mingw-w64-x86_64-python-lxml mingw-w64-x86_64-python-jsonschema mingw-w64-x86_64-gspell mingw-w64-x86_64-geocode-glib mingw-w64-x86_64-python-pillow git mingw-w64-x86_64-graphviz mingw-w64-x86_64-goocanvas mingw-w64-x86_64-osm-gps-map base-devel subversion mingw-w64-x86_64-python-graphviz mingw-w64-x86_64-osm-gps-map mingw-w64-x86_64-nsis mingw-w64-x86_64-python-requests mingw-w64-x86_64-adwaita-icon-theme mingw-w64-x86_64-python-networkx mingw-w64-x86_64-python-psycopg2 upx mingw-w64-x86_64-python-packaging unzip mingw-w64-x86_64-python-nose mingw-w64-x86_64-python-wheel
+pacman -S --needed --noconfirm \
+    base-devel \
+    git \
+    mingw-w64-x86_64-adwaita-icon-theme \
+    mingw-w64-x86_64-enchant \
+    mingw-w64-x86_64-geocode-glib \
+    mingw-w64-x86_64-gexiv2 \
+    mingw-w64-x86_64-ghostscript \
+    mingw-w64-x86_64-goocanvas \
+    mingw-w64-x86_64-graphviz \
+    mingw-w64-x86_64-gspell \
+    mingw-w64-x86_64-hunspell \
+    mingw-w64-x86_64-iso-codes \
+    mingw-w64-x86_64-nsis \
+    mingw-w64-x86_64-osm-gps-map \
+    mingw-w64-x86_64-python \
+    mingw-w64-x86_64-python-cairo \
+    mingw-w64-x86_64-python-cx-freeze \
+    mingw-w64-x86_64-python-gobject \
+    mingw-w64-x86_64-python-graphviz \
+    mingw-w64-x86_64-python-icu \
+    mingw-w64-x86_64-python-jsonschema \
+    mingw-w64-x86_64-python-lxml \
+    mingw-w64-x86_64-python-networkx \
+    mingw-w64-x86_64-python-nose \
+    mingw-w64-x86_64-python-packaging \
+    mingw-w64-x86_64-python-pillow \
+    mingw-w64-x86_64-python-pip \
+    mingw-w64-x86_64-python-psycopg2 \
+    mingw-w64-x86_64-python-pycountry \
+    mingw-w64-x86_64-python-requests \
+    mingw-w64-x86_64-python-wheel \
+    perl-XML-Parser \
+    unzip \
+    upx
 pacman -S --needed --noconfirm mingw-w64-x86_64-toolchain
 
 wget --no-verbose -N https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-cx-freeze-6.15.9-1-any.pkg.tar.zst

diff --git a/data/css/Web_Basic-Blue.css b/data/css/Web_Basic-Blue.css
@@ -20,8 +20,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: Web_Basic-Blue.css 15540 2010-06-07 16:32:00Z robhealey1 $
-#
+
 *************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Basic Blue Stylesheet

diff --git a/data/css/Web_Vertical-Menus.css b/data/css/Web_Vertical-Menus.css
@@ -25,8 +25,6 @@ GRAMPS Cascading Style Sheet
 Style Name: Web_Navigation-Vertical.css Stylesheet
 *******************************************************************************
 
-# $Id: Web_Navigation-Vertical.css 15241 2010-04-19 11:07:00Z robhealey1 $
-
  Body Element
 ----------------------------------------------------- */
 body {

diff --git a/data/css/ancestortree.css b/data/css/ancestortree.css
@@ -18,8 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: $
-#
+
 *******************************************************************************
 GRAMPS Cascading Style Sheet
 Style Name: Combined Ancestor Tree Style Sheet

diff --git a/data/tests/exp_sample_ged.ged b/data/tests/exp_sample_ged.ged
@@ -75,8 +75,6 @@
 2 TYPE Christening of Amber Marie Smith
 2 DATE 26 APR 1998
 2 PLAC Community Presbyterian Church, Danville, CA
-2 ADDR
-3 ADR2 Community Presbyterian Church, Danville, CA
 1 FAMC @F0013@
 2 PEDI birth
 1 CHAN
@@ -131,8 +129,6 @@
 2 TYPE Christening of Mason Michael Smith
 2 DATE 10 JUL 1996
 2 PLAC Community Presbyterian Church, Danville, CA
-2 ADDR
-3 ADR2 Community Presbyterian Church, Danville, CA
 1 FAMC @F0013@
 2 PEDI birth
 1 CHAN
@@ -626,10 +622,6 @@
 3 MAP
 4 LATI N39.7392
 4 LONG W104.9903
-2 ADDR
-3 CITY Denver, Denver Co., CO
-3 STAE Colorado
-3 CTRY USA
 1 DEAT
 2 TYPE Death of Marjorie Ohman
 2 DATE 22 JUN 1980
@@ -648,8 +640,6 @@
 2 TYPE Birth of Darcy Horne
 2 DATE 2 JUL 1966
 2 PLAC Sacramento, Sacramento Co., CA
-2 ADDR
-3 CITY Sacramento, Sacramento Co., CA
 1 FAMS @F0010@
 1 CHAN
 2 DATE 21 DEC 2007
@@ -858,12 +848,6 @@
 1 BIRT
 2 DATE 29 DEC 1954
 2 PLAC 123 High St, Cleveland, Cuyahoga, Ohio, USA
-2 ADDR 123 High St
-3 ADR1 123 High St
-3 CITY Cleveland
-3 STAE Ohio
-3 POST 44140
-3 CTRY USA
 2 PHON 440-871-3400
 2 PHON 800-871-3400
 2 EMAIL thetester@@gmail.com
@@ -884,8 +868,7 @@
 1 SOUR @S0005@
 1 RESI
 2 DATE 27 OCT 2017
-2 ADDR
-3 CONT test village
+2 ADDR test village
 3 CONT Akron
 3 CONT OH
 3 CONT 44177
@@ -946,10 +929,6 @@
 3 MAP
 4 LATI N39.7392
 4 LONG W104.9903
-2 ADDR
-3 CITY Denver, Denver Co., CO
-3 STAE Colorado
-3 CTRY USA
 2 PHON 440-871-3402
 2 EMAIL tomtester@@gmail.com
 2 FAX 440-321-4569
@@ -965,10 +944,6 @@
 3 MAP
 4 LATI N39.7392
 4 LONG W104.9903
-2 ADDR
-3 CITY Denver, Denver Co., CO
-3 STAE Colorado
-3 CTRY USA
 1 FAMC @F0016@
 2 PEDI birth
 1 SOUR @S0005@
@@ -1023,10 +998,6 @@
 3 MAP
 4 LATI N39.7392
 4 LONG W104.9903
-2 ADDR
-3 CITY Denver, Denver Co., CO
-3 STAE Colorado
-3 CTRY USA
 2 STAT QUALIFIED
 1 FAMC @F0016@
 2 _FREL Adopted
@@ -1278,8 +1249,6 @@
 2 DATE 22 FEB 2000
 2 TEMP DENVE
 2 PLAC Community Presbyterian Church, Danville, CA
-2 ADDR
-3 ADR2 Community Presbyterian Church, Danville, CA
 2 STAT CLEARED
 1 MARR
 2 HUSB

diff --git a/gramps/gen/config.py b/gramps/gen/config.py
@@ -177,14 +177,14 @@ def emit(key):
 register("behavior.web-search-url", "http://google.com/#&q=%(text)s")
 register(
     "behavior.addons-url",
-    "https://raw.githubusercontent.com/gramps-project/addons/master/gramps52",
+    "https://raw.githubusercontent.com/gramps-project/addons/master/gramps53",
 )
 register(
     "behavior.addons-projects",
     [
         [
             "Gramps",
-            "https://raw.githubusercontent.com/gramps-project/addons/master/gramps52",
+            "https://raw.githubusercontent.com/gramps-project/addons/master/gramps53",
             True,
         ]
     ],

diff --git a/gramps/gen/datehandler/_date_hr.py b/gramps/gen/datehandler/_date_hr.py
@@ -18,8 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: _date_hr.py 22672 2013-07-13 18:01:08Z paul-franklin $
-#
 
 # Croatian version 2008 by Josip
 # Croatian version 2018 by Milo