diff --git a/Makefile b/Makefile index 119d326..3814e23 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,8 @@ uninstall: pkgbuild.pkgver: $(eval MAJOR := $(shell grep \^MAJOR_VERSION emmental/__init__.py | awk -F= '{ gsub(/ /,""); print $$2}')) $(eval MINOR := $(shell grep \^MINOR_VERSION emmental/__init__.py | awk -F= '{ gsub(/ /,""); print $$2}')) - sed -i 's/^pkgver=.*/pkgver=${MAJOR}.${MINOR}/' aur/PKGBUILD + $(eval MICRO := $(shell grep \^MICRO_VERSION emmental/__init__.py | awk -F= '{ gsub(/ /,""); print $$2}')) + sed -i 's/^pkgver=.*/pkgver=${MAJOR}.${MINOR}.${MICRO}/' aur/PKGBUILD .PHONY: pkgbuild.sha256sum pkgbuild.sha256sum: diff --git a/emmental/__init__.py b/emmental/__init__.py index 0901b3c..9bc9e13 100644 --- a/emmental/__init__.py +++ b/emmental/__init__.py @@ -20,7 +20,10 @@ from gi.repository import Adw MAJOR_VERSION = 3 MINOR_VERSION = 0 -VERSION_STRING = f"Emmental {MAJOR_VERSION}.{MINOR_VERSION}{gsetup.DEBUG_STR}" +MICRO_VERSION = 1 + +VERSION_NUMBER = f"{MAJOR_VERSION}.{MINOR_VERSION}.{MICRO_VERSION}" +VERSION_STRING = f"Emmental {VERSION_NUMBER}{gsetup.DEBUG_STR}" class Application(Adw.Application): @@ -261,7 +264,7 @@ class Application(Adw.Application): gsetup.add_style() musicbrainzngs.set_useragent(f"emmental{gsetup.DEBUG_STR}", - f"{MAJOR_VERSION}.{MINOR_VERSION}") + VERSION_NUMBER) self.db.tracks.connect("notify::loaded", self.__tracks_table_loaded) self.db.load() diff --git a/tests/test_emmental.py b/tests/test_emmental.py index a71ae49..70ecc64 100644 --- a/tests/test_emmental.py +++ b/tests/test_emmental.py @@ -22,7 +22,9 @@ class TestEmmental(unittest.TestCase): """Check that version constants have been set properly.""" self.assertEqual(emmental.MAJOR_VERSION, 3) self.assertEqual(emmental.MINOR_VERSION, 0) - self.assertEqual(emmental.VERSION_STRING, "Emmental 3.0-debug") + self.assertEqual(emmental.MICRO_VERSION, 1) + self.assertEqual(emmental.VERSION_NUMBER, "3.0.1") + self.assertEqual(emmental.VERSION_STRING, "Emmental 3.0.1-debug") def test_application(self): """Check that the application instance is initialized properly.""" @@ -61,7 +63,7 @@ class TestEmmental(unittest.TestCase): mock_startup.assert_called() mock_load.assert_called() mock_add_window.assert_called_with(self.application.win) - mock_set_useragent.assert_called_with("emmental-debug", "3.0") + mock_set_useragent.assert_called_with("emmental-debug", "3.0.1") @unittest.mock.patch("sys.stdout") @unittest.mock.patch("gi.repository.Adw.Application.add_window")