diff --git a/.github/workflows/gramps-ci.yml b/.github/workflows/gramps-ci.yml index 38a8315816..288949958a 100644 --- a/.github/workflows/gramps-ci.yml +++ b/.github/workflows/gramps-ci.yml @@ -20,9 +20,9 @@ name: Gramps CI on: push: - branches: [ master ] + branches: [ maintenance/gramps61 ] pull_request: - branches: [ master ] + branches: [ maintenance/gramps61 ] jobs: build: @@ -61,9 +61,9 @@ jobs: - 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 + wget https://github.com/gramps-project/addons/raw/master/gramps61/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 + wget https://github.com/gramps-project/addons/raw/master/gramps61/download/ExportRaw.addon.tgz tar -C ~/.local/share/gramps/gramps60/plugins/ -xzf ExportRaw.addon.tgz - name: Build run: | diff --git a/docs/conf.py b/docs/conf.py index 498055ead3..46c299f69b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -65,9 +65,9 @@ author = "Donald N. Allingham" # built documents. # # The short X.Y version. -version = "6.0" +version = "6.1" # The full version, including alpha/beta/rc tags. -release = "6.0.0" +release = "6.1.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/gramps/plugins/cite/cite.gpr.py b/gramps/plugins/cite/cite.gpr.py index 45546b021b..3a686ab9ff 100644 --- a/gramps/plugins/cite/cite.gpr.py +++ b/gramps/plugins/cite/cite.gpr.py @@ -20,7 +20,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/db/bsddb/bsddb.gpr.py b/gramps/plugins/db/bsddb/bsddb.gpr.py index b4954721e7..e679b0783a 100644 --- a/gramps/plugins/db/bsddb/bsddb.gpr.py +++ b/gramps/plugins/db/bsddb/bsddb.gpr.py @@ -27,7 +27,7 @@ plg.name = _("BSDDB") plg.name_accell = _("_BSDDB Database") plg.description = _("Berkeley Software Distribution Database Backend") plg.version = "2.0" -plg.gramps_target_version = "6.0" +plg.gramps_target_version = "6.1" plg.status = STABLE plg.fname = "bsddb.py" plg.ptype = DATABASE diff --git a/gramps/plugins/db/dbapi/sqlite.gpr.py b/gramps/plugins/db/dbapi/sqlite.gpr.py index c0296012eb..12f3f3e597 100644 --- a/gramps/plugins/db/dbapi/sqlite.gpr.py +++ b/gramps/plugins/db/dbapi/sqlite.gpr.py @@ -28,7 +28,7 @@ register( name_accell=_("_SQLite Database"), description=_("SQLite Database"), version="1.0.0", - gramps_target_version="6.0", + gramps_target_version="6.1", status=STABLE, fname="sqlite.py", databaseclass="SQLite", diff --git a/gramps/plugins/docgen/docgen.gpr.py b/gramps/plugins/docgen/docgen.gpr.py index 6601030533..4d5236c59d 100644 --- a/gramps/plugins/docgen/docgen.gpr.py +++ b/gramps/plugins/docgen/docgen.gpr.py @@ -21,7 +21,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/drawreport/drawplugins.gpr.py b/gramps/plugins/drawreport/drawplugins.gpr.py index 7d386a0e8a..e64d158f77 100644 --- a/gramps/plugins/drawreport/drawplugins.gpr.py +++ b/gramps/plugins/drawreport/drawplugins.gpr.py @@ -22,7 +22,7 @@ from gramps.gen.const import URL_MANUAL_PAGE, GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" REPORTS_HELP = URL_MANUAL_PAGE + "_-_Reports#Graphical_Reports" # this is the default in gen/plug/_pluginreg.py: plg.require_active = True diff --git a/gramps/plugins/export/export.gpr.py b/gramps/plugins/export/export.gpr.py index 65643b88de..176a91a416 100644 --- a/gramps/plugins/export/export.gpr.py +++ b/gramps/plugins/export/export.gpr.py @@ -21,7 +21,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/gramplet/gramplet.gpr.py b/gramps/plugins/gramplet/gramplet.gpr.py index a3198a9883..123a5be57c 100644 --- a/gramps/plugins/gramplet/gramplet.gpr.py +++ b/gramps/plugins/gramplet/gramplet.gpr.py @@ -25,9 +25,9 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" -GRAMPLET_HELP = _("Gramps_6.0_Wiki_Manual_-_Gramplets#Gramplet_List") -DEBUG_HELP = _("Gramps_6.0_Wiki_Manual_-_Tools#Debug") +MODULE_VERSION = "6.1" +GRAMPLET_HELP = _("Gramps_6.1_Wiki_Manual_-_Gramplets#Gramplet_List") +DEBUG_HELP = _("Gramps_6.1_Wiki_Manual_-_Tools#Debug") # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/graph/graphplugins.gpr.py b/gramps/plugins/graph/graphplugins.gpr.py index f78c751323..d45e7ae33f 100644 --- a/gramps/plugins/graph/graphplugins.gpr.py +++ b/gramps/plugins/graph/graphplugins.gpr.py @@ -21,7 +21,7 @@ from gramps.gen.const import URL_MANUAL_PAGE, GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" REPORTS_HELP = URL_MANUAL_PAGE + "_-_Reports#Graphs" # this is the default in gen/plug/_pluginreg.py: plg.require_active = True diff --git a/gramps/plugins/importer/import.gpr.py b/gramps/plugins/importer/import.gpr.py index 1d2ac4a9d8..01c011d1dd 100644 --- a/gramps/plugins/importer/import.gpr.py +++ b/gramps/plugins/importer/import.gpr.py @@ -21,7 +21,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/lib/libplugins.gpr.py b/gramps/plugins/lib/libplugins.gpr.py index d895c8cb41..9e7b231e03 100644 --- a/gramps/plugins/lib/libplugins.gpr.py +++ b/gramps/plugins/lib/libplugins.gpr.py @@ -22,7 +22,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/mapservices/mapservice.gpr.py b/gramps/plugins/mapservices/mapservice.gpr.py index af73b3bb25..e0e5cb1a0c 100644 --- a/gramps/plugins/mapservices/mapservice.gpr.py +++ b/gramps/plugins/mapservices/mapservice.gpr.py @@ -20,7 +20,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/quickview/quickview.gpr.py b/gramps/plugins/quickview/quickview.gpr.py index 3357b6906e..f09c16e1dc 100644 --- a/gramps/plugins/quickview/quickview.gpr.py +++ b/gramps/plugins/quickview/quickview.gpr.py @@ -22,7 +22,7 @@ from gramps.gen.const import URL_MANUAL_PAGE, GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" QUICKVIEWS_HELP = URL_MANUAL_PAGE + "_-_Reports#Quick_Views" # ------------------------------------------------------------------------ diff --git a/gramps/plugins/rel/relplugins.gpr.py b/gramps/plugins/rel/relplugins.gpr.py index be3703b494..20c34abcb0 100644 --- a/gramps/plugins/rel/relplugins.gpr.py +++ b/gramps/plugins/rel/relplugins.gpr.py @@ -22,7 +22,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # # Relationship calculators diff --git a/gramps/plugins/sidebar/sidebar.gpr.py b/gramps/plugins/sidebar/sidebar.gpr.py index fc5d14a4ac..5019afea91 100644 --- a/gramps/plugins/sidebar/sidebar.gpr.py +++ b/gramps/plugins/sidebar/sidebar.gpr.py @@ -20,7 +20,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/textreport/textplugins.gpr.py b/gramps/plugins/textreport/textplugins.gpr.py index 5701a2c5ec..6b226c53d0 100644 --- a/gramps/plugins/textreport/textplugins.gpr.py +++ b/gramps/plugins/textreport/textplugins.gpr.py @@ -22,7 +22,7 @@ from gramps.gen.const import URL_MANUAL_PAGE, GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" REPORTS_HELP = URL_MANUAL_PAGE + "_-_Reports#Text_Reports" # this is the default in gen/plug/_pluginreg.py: plg.require_active = True diff --git a/gramps/plugins/thumbnailer/thumb.gpr.py b/gramps/plugins/thumbnailer/thumb.gpr.py index 176d2e879c..8d2feb99f6 100644 --- a/gramps/plugins/thumbnailer/thumb.gpr.py +++ b/gramps/plugins/thumbnailer/thumb.gpr.py @@ -20,7 +20,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/tool/tools.gpr.py b/gramps/plugins/tool/tools.gpr.py index 82f4305cd7..97b501907d 100644 --- a/gramps/plugins/tool/tools.gpr.py +++ b/gramps/plugins/tool/tools.gpr.py @@ -26,7 +26,7 @@ TOOLS_HELP = URL_MANUAL_PAGE + "_-_Navigation#Tools" GRAMPS registration file """ -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/tool/toolsdebug.gpr.py b/gramps/plugins/tool/toolsdebug.gpr.py index 0aafedb740..0e319022b0 100644 --- a/gramps/plugins/tool/toolsdebug.gpr.py +++ b/gramps/plugins/tool/toolsdebug.gpr.py @@ -26,7 +26,7 @@ DEBUG_HELP = URL_MANUAL_PAGE + "_-_Tools#Debug" GRAMPS registration file """ -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/view/geography.gpr.py b/gramps/plugins/view/geography.gpr.py index 02352cbd55..72f1121838 100644 --- a/gramps/plugins/view/geography.gpr.py +++ b/gramps/plugins/view/geography.gpr.py @@ -27,7 +27,7 @@ # pylint: disable=bad-whitespace # pylint: disable=bad-whitespace -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" from gi import Repository from gramps.gen.const import GRAMPS_LOCALE as glocale diff --git a/gramps/plugins/view/view.gpr.py b/gramps/plugins/view/view.gpr.py index b6911461b4..1e874f035d 100644 --- a/gramps/plugins/view/view.gpr.py +++ b/gramps/plugins/view/view.gpr.py @@ -24,7 +24,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/plugins/webreport/webplugins.gpr.py b/gramps/plugins/webreport/webplugins.gpr.py index 90b6adffaf..9e0353ef5a 100644 --- a/gramps/plugins/webreport/webplugins.gpr.py +++ b/gramps/plugins/webreport/webplugins.gpr.py @@ -21,7 +21,7 @@ from gramps.gen.const import URL_MANUAL_PAGE, GRAMPS_LOCALE as glocale _ = glocale.translation.gettext -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" REPORTS_HELP = URL_MANUAL_PAGE + "_-_Reports#Web_Pages" # ------------------------------------------------------------------------ diff --git a/gramps/plugins/webstuff/webstuff.gpr.py b/gramps/plugins/webstuff/webstuff.gpr.py index a88ef37659..70b299a355 100644 --- a/gramps/plugins/webstuff/webstuff.gpr.py +++ b/gramps/plugins/webstuff/webstuff.gpr.py @@ -23,7 +23,7 @@ _ = glocale.translation.gettext # plugins/webstuff/webstuff.gpr.py -MODULE_VERSION = "6.0" +MODULE_VERSION = "6.1" # ------------------------------------------------------------------------ # diff --git a/gramps/version.py b/gramps/version.py index 40a9239f36..9d1c412f63 100644 --- a/gramps/version.py +++ b/gramps/version.py @@ -18,7 +18,7 @@ # DEV_VERSION = True -VERSION_TUPLE = (6, 0, 0) +VERSION_TUPLE = (6, 1, 0) VERSION_QUALIFIER = "" VERSION = ".".join(map(str, VERSION_TUPLE)) + VERSION_QUALIFIER major_version = "%s.%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1])