From a8fa11335417e288003fca119fc55fca381de1de Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Thu, 30 May 2024 07:43:25 +0200 Subject: [PATCH 1/8] change package-data specifier --- linien-gui/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linien-gui/pyproject.toml b/linien-gui/pyproject.toml index 74cb9154..9e8196c9 100644 --- a/linien-gui/pyproject.toml +++ b/linien-gui/pyproject.toml @@ -48,4 +48,4 @@ include-package-data = false namespaces = false [tool.setuptools.package-data] -linien_gui = ["*.ui"] +"linien_gui.ui" = ["*.ui"] From 1ff0c5d5db3a2fed0fa32165a25275a3995cff6b Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Thu, 30 May 2024 07:44:16 +0200 Subject: [PATCH 2/8] bump version to 2.0.4 --- linien-client/pyproject.toml | 4 ++-- linien-common/pyproject.toml | 2 +- linien-gui/pyproject.toml | 4 ++-- linien-server/pyproject.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linien-client/pyproject.toml b/linien-client/pyproject.toml index 67c4fcc6..5abfa8a8 100644 --- a/linien-client/pyproject.toml +++ b/linien-client/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-client" -version = "2.0.3" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -25,7 +25,7 @@ requires-python = ">=3.8" dependencies = [ "fabric>=3.2.2,<4.0", "typing_extensions>=4.5.0,<5.0", - "linien-common==2.0.3", + "linien-common==2.0.4", ] [project.readme] diff --git a/linien-common/pyproject.toml b/linien-common/pyproject.toml index 22cf89d7..6251f6f6 100644 --- a/linien-common/pyproject.toml +++ b/linien-common/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-common" -version = "2.0.3" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, diff --git a/linien-gui/pyproject.toml b/linien-gui/pyproject.toml index 9e8196c9..66a85035 100644 --- a/linien-gui/pyproject.toml +++ b/linien-gui/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-gui" -version = "2.0.3" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -28,7 +28,7 @@ dependencies = [ "PyQt5>=5.12.0,<6.0", "requests>=2.31.0,<3.0", "superqt>=0.2.3", - "linien_client==2.0.3", + "linien_client==2.0.4", ] [project.readme] diff --git a/linien-server/pyproject.toml b/linien-server/pyproject.toml index a5673ee6..d6ce8d9b 100644 --- a/linien-server/pyproject.toml +++ b/linien-server/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-server" -version = "2.0.3" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -28,7 +28,7 @@ dependencies = [ "influxdb-client[ciso]>=1.9,<2.0", "pylpsd>=0.1.4", "pyrp3>=2.0.1,<3.0;platform_machine=='armv7l'", - "linien-common==2.0.3", + "linien-common==2.0.4", ] [project.readme] From d0a2263aa275409e9b31a425ea9ec8d0aebf991b Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Thu, 30 May 2024 07:48:37 +0200 Subject: [PATCH 3/8] update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e91dd88c..76c7496b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.0.4] - 2024-05-30 + +### Fixed +* Fixed bug where `*.ui` would not be included in the `linien-gui` package by @bleykauf in https://github.com/linien-org/linien/pull/407 + ## [2.0.3] - 2024-05-29 ### Fixed @@ -225,6 +230,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * **Bug fixes and performance improvements** +[2.0.4]: https://github.com/linien-org/linien/compare/v2.0.3...v2.0.4 [2.0.3]: https://github.com/linien-org/linien/compare/v2.0.2...v2.0.3 [2.0.2]: https://github.com/linien-org/linien/compare/v2.0.1...v2.0.2 [2.0.1]: https://github.com/linien-org/linien/compare/v2.0.0...v2.0.1 From 4c5a4dfcb47b4b6194b29b295da98cd024511c43 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Thu, 30 May 2024 07:49:36 +0200 Subject: [PATCH 4/8] bump version to 2.0.4rc1 --- linien-client/pyproject.toml | 4 ++-- linien-common/pyproject.toml | 2 +- linien-gui/pyproject.toml | 4 ++-- linien-server/pyproject.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linien-client/pyproject.toml b/linien-client/pyproject.toml index 5abfa8a8..605e58e1 100644 --- a/linien-client/pyproject.toml +++ b/linien-client/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-client" -version = "2.0.4" +version = "2.0.4rc1" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -25,7 +25,7 @@ requires-python = ">=3.8" dependencies = [ "fabric>=3.2.2,<4.0", "typing_extensions>=4.5.0,<5.0", - "linien-common==2.0.4", + "linien-common==2.0.4rc1", ] [project.readme] diff --git a/linien-common/pyproject.toml b/linien-common/pyproject.toml index 6251f6f6..e756f146 100644 --- a/linien-common/pyproject.toml +++ b/linien-common/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-common" -version = "2.0.4" +version = "2.0.4rc1" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, diff --git a/linien-gui/pyproject.toml b/linien-gui/pyproject.toml index 66a85035..ac35b451 100644 --- a/linien-gui/pyproject.toml +++ b/linien-gui/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-gui" -version = "2.0.4" +version = "2.0.4rc1" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -28,7 +28,7 @@ dependencies = [ "PyQt5>=5.12.0,<6.0", "requests>=2.31.0,<3.0", "superqt>=0.2.3", - "linien_client==2.0.4", + "linien_client==2.0.4rc1", ] [project.readme] diff --git a/linien-server/pyproject.toml b/linien-server/pyproject.toml index d6ce8d9b..bb1c2344 100644 --- a/linien-server/pyproject.toml +++ b/linien-server/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-server" -version = "2.0.4" +version = "2.0.4rc1" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -28,7 +28,7 @@ dependencies = [ "influxdb-client[ciso]>=1.9,<2.0", "pylpsd>=0.1.4", "pyrp3>=2.0.1,<3.0;platform_machine=='armv7l'", - "linien-common==2.0.4", + "linien-common==2.0.4rc1", ] [project.readme] From 4aed1535b2498caae022c5f58bd64fb0ff868159 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Thu, 30 May 2024 08:04:13 +0200 Subject: [PATCH 5/8] bump version to 2.0.4 --- linien-client/pyproject.toml | 4 ++-- linien-common/pyproject.toml | 2 +- linien-gui/pyproject.toml | 4 ++-- linien-server/pyproject.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linien-client/pyproject.toml b/linien-client/pyproject.toml index 605e58e1..5abfa8a8 100644 --- a/linien-client/pyproject.toml +++ b/linien-client/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-client" -version = "2.0.4rc1" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -25,7 +25,7 @@ requires-python = ">=3.8" dependencies = [ "fabric>=3.2.2,<4.0", "typing_extensions>=4.5.0,<5.0", - "linien-common==2.0.4rc1", + "linien-common==2.0.4", ] [project.readme] diff --git a/linien-common/pyproject.toml b/linien-common/pyproject.toml index e756f146..6251f6f6 100644 --- a/linien-common/pyproject.toml +++ b/linien-common/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-common" -version = "2.0.4rc1" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, diff --git a/linien-gui/pyproject.toml b/linien-gui/pyproject.toml index ac35b451..66a85035 100644 --- a/linien-gui/pyproject.toml +++ b/linien-gui/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-gui" -version = "2.0.4rc1" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -28,7 +28,7 @@ dependencies = [ "PyQt5>=5.12.0,<6.0", "requests>=2.31.0,<3.0", "superqt>=0.2.3", - "linien_client==2.0.4rc1", + "linien_client==2.0.4", ] [project.readme] diff --git a/linien-server/pyproject.toml b/linien-server/pyproject.toml index bb1c2344..d6ce8d9b 100644 --- a/linien-server/pyproject.toml +++ b/linien-server/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-server" -version = "2.0.4rc1" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -28,7 +28,7 @@ dependencies = [ "influxdb-client[ciso]>=1.9,<2.0", "pylpsd>=0.1.4", "pyrp3>=2.0.1,<3.0;platform_machine=='armv7l'", - "linien-common==2.0.4rc1", + "linien-common==2.0.4", ] [project.readme] From a067e1df4c72c43e0dfe93297fb7b5e5c53a85d4 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Thu, 30 May 2024 08:08:08 +0200 Subject: [PATCH 6/8] bump version to 2.0.4rc2 --- linien-client/pyproject.toml | 4 ++-- linien-common/pyproject.toml | 2 +- linien-gui/pyproject.toml | 4 ++-- linien-server/pyproject.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linien-client/pyproject.toml b/linien-client/pyproject.toml index 5abfa8a8..5188e87f 100644 --- a/linien-client/pyproject.toml +++ b/linien-client/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-client" -version = "2.0.4" +version = "2.0.4rc2" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -25,7 +25,7 @@ requires-python = ">=3.8" dependencies = [ "fabric>=3.2.2,<4.0", "typing_extensions>=4.5.0,<5.0", - "linien-common==2.0.4", + "linien-common==2.0.4rc2", ] [project.readme] diff --git a/linien-common/pyproject.toml b/linien-common/pyproject.toml index 6251f6f6..78149018 100644 --- a/linien-common/pyproject.toml +++ b/linien-common/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-common" -version = "2.0.4" +version = "2.0.4rc2" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, diff --git a/linien-gui/pyproject.toml b/linien-gui/pyproject.toml index 66a85035..b157178c 100644 --- a/linien-gui/pyproject.toml +++ b/linien-gui/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-gui" -version = "2.0.4" +version = "2.0.4rc2" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -28,7 +28,7 @@ dependencies = [ "PyQt5>=5.12.0,<6.0", "requests>=2.31.0,<3.0", "superqt>=0.2.3", - "linien_client==2.0.4", + "linien_client==2.0.4rc2", ] [project.readme] diff --git a/linien-server/pyproject.toml b/linien-server/pyproject.toml index d6ce8d9b..3e9a41eb 100644 --- a/linien-server/pyproject.toml +++ b/linien-server/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-server" -version = "2.0.4" +version = "2.0.4rc2" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -28,7 +28,7 @@ dependencies = [ "influxdb-client[ciso]>=1.9,<2.0", "pylpsd>=0.1.4", "pyrp3>=2.0.1,<3.0;platform_machine=='armv7l'", - "linien-common==2.0.4", + "linien-common==2.0.4rc2", ] [project.readme] From 462480c1e50c6485222e717078f2a5cf8ca4f3aa Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Thu, 30 May 2024 08:13:39 +0200 Subject: [PATCH 7/8] include icon in package --- linien-gui/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/linien-gui/pyproject.toml b/linien-gui/pyproject.toml index b157178c..3c9112b8 100644 --- a/linien-gui/pyproject.toml +++ b/linien-gui/pyproject.toml @@ -49,3 +49,4 @@ namespaces = false [tool.setuptools.package-data] "linien_gui.ui" = ["*.ui"] +linien_gui = ["icon.ico"] From fb53b4940f978e9b3a6fb6c7fd66a3cc3da87949 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Thu, 30 May 2024 08:21:08 +0200 Subject: [PATCH 8/8] bump version to 2.0.4 --- linien-client/pyproject.toml | 4 ++-- linien-common/pyproject.toml | 2 +- linien-gui/pyproject.toml | 4 ++-- linien-server/pyproject.toml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linien-client/pyproject.toml b/linien-client/pyproject.toml index 5188e87f..5abfa8a8 100644 --- a/linien-client/pyproject.toml +++ b/linien-client/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-client" -version = "2.0.4rc2" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -25,7 +25,7 @@ requires-python = ">=3.8" dependencies = [ "fabric>=3.2.2,<4.0", "typing_extensions>=4.5.0,<5.0", - "linien-common==2.0.4rc2", + "linien-common==2.0.4", ] [project.readme] diff --git a/linien-common/pyproject.toml b/linien-common/pyproject.toml index 78149018..6251f6f6 100644 --- a/linien-common/pyproject.toml +++ b/linien-common/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-common" -version = "2.0.4rc2" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, diff --git a/linien-gui/pyproject.toml b/linien-gui/pyproject.toml index 3c9112b8..f93b0e8b 100644 --- a/linien-gui/pyproject.toml +++ b/linien-gui/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-gui" -version = "2.0.4rc2" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -28,7 +28,7 @@ dependencies = [ "PyQt5>=5.12.0,<6.0", "requests>=2.31.0,<3.0", "superqt>=0.2.3", - "linien_client==2.0.4rc2", + "linien_client==2.0.4", ] [project.readme] diff --git a/linien-server/pyproject.toml b/linien-server/pyproject.toml index 3e9a41eb..d6ce8d9b 100644 --- a/linien-server/pyproject.toml +++ b/linien-server/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "linien-server" -version = "2.0.4rc2" +version = "2.0.4" authors = [ { name = "Benjamin Wiegand", email = "benjamin.wiegand@physik.hu-berlin.de" }, { name = "Bastian Leykauf", email = "leykauf@physik.hu-berlin.de" }, @@ -28,7 +28,7 @@ dependencies = [ "influxdb-client[ciso]>=1.9,<2.0", "pylpsd>=0.1.4", "pyrp3>=2.0.1,<3.0;platform_machine=='armv7l'", - "linien-common==2.0.4rc2", + "linien-common==2.0.4", ] [project.readme]