From 05b14fc965f4019dea6cb57c21e9475dd09aa1c1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 16:56:42 +0000 Subject: [PATCH 01/16] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 24.3.0 → 24.4.2](https://github.com/psf/black/compare/24.3.0...24.4.2) - [github.com/pycqa/flake8: 6.1.0 → 7.0.0](https://github.com/pycqa/flake8/compare/6.1.0...7.0.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6b625f40..d8c3b52f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: 24.3.0 + rev: 24.4.2 hooks: - id: black exclude: ^(gateware/logic/|gateware/lowlevel/|gateware/linien_module.py|linien-server/linien_server/csrmap.py) @@ -12,7 +12,7 @@ repos: name: isort (python) - repo: https://github.com/pycqa/flake8 - rev: 6.1.0 + rev: 7.0.0 hooks: - id: flake8 exclude: linien-server/linien_server/csrmap.py From 7df762af444f40489b57b5b55c6ca7928f39bcea Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 11:01:51 +0200 Subject: [PATCH 02/16] only import linien modules when needed --- linien-server/linien_server/cli.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/linien-server/linien_server/cli.py b/linien-server/linien_server/cli.py index cbc2cd36..b7a53bde 100644 --- a/linien-server/linien_server/cli.py +++ b/linien-server/linien_server/cli.py @@ -23,16 +23,6 @@ from typing import Optional import fire -from linien_common.communication import ( - no_authenticator, - username_and_password_authenticator, -) -from linien_server import __version__, mdio_tool -from linien_server.server import ( - FakeRedPitayaControlService, - RedPitayaControlService, - run_threaded_server, -) logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) @@ -49,6 +39,8 @@ def copy_systemd_service_file() -> None: class LinienServerCLI: def version(self) -> str: """Return the version of the Linien server.""" + from linien_server import __version__ + return __version__ def start(self) -> None: @@ -76,6 +68,17 @@ def run(self, fake: bool = False, host: Optional[str] = None) -> None: fake: Whether to run a fake server. host: The hostname of the Red Pitaya. """ + from linien_common.communication import ( + no_authenticator, + username_and_password_authenticator, + ) + from linien_server import mdio_tool + from linien_server.server import ( + FakeRedPitayaControlService, + RedPitayaControlService, + run_threaded_server, + ) + if fake: control = FakeRedPitayaControlService() else: From 32b0f35ceaea043b625167e58d784cc474a3e7b3 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 11:06:52 +0200 Subject: [PATCH 03/16] bump version number --- CHANGELOG.md | 5 ++++- linien-client/pyproject.toml | 4 ++-- linien-common/pyproject.toml | 2 +- linien-gui/pyproject.toml | 4 ++-- linien-server/pyproject.toml | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a05ae4f3..c1787c64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ 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). +## [Unreleased] + + ## [2.0.1] - 2024-05-13 ### Fixed @@ -210,7 +213,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * **Bug fixes and performance improvements** - +[Unreleased]: https://github.com/linien-org/linien/compare/v2.0.1...HEAD [2.0.1]: https://github.com/linien-org/linien/compare/v2.0.0...v2.0.1 [2.0.0]: https://github.com/linien-org/linien/compare/v1.0.2...v2.0.0 [1.0.2]: https://github.com/linien-org/linien/compare/v1.0.1...v1.0.2 diff --git a/linien-client/pyproject.toml b/linien-client/pyproject.toml index 54af7b3b..c328bc4c 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.1" +version = "2.1.0.dev0" 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>=2.7.0,<3.0", "typing_extensions>=4.5.0,<5.0", - "linien-common==2.0.1", + "linien-common==2.1.0.dev0", ] [project.readme] diff --git a/linien-common/pyproject.toml b/linien-common/pyproject.toml index ba71b327..772cfbd0 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.1" +version = "2.1.0.dev0" 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 85f22080..ce1c2eac 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.1" +version = "2.1.0.dev0" 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.1", + "linien_client==2.1.0.dev0", ] [project.readme] diff --git a/linien-server/pyproject.toml b/linien-server/pyproject.toml index 26a4d70a..20968c30 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.1" +version = "2.1.0.dev0" 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.1", + "linien-common==2.1.0.dev0", ] [project.readme] From 9bb4fbe30ff94df4212f672cdb0e441c737899aa Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 11:08:38 +0200 Subject: [PATCH 04/16] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1787c64..71c4b519 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed +* Improved performance of server CLI by @bleykauf in https://github.com/linien-org/linien/pull/396 ## [2.0.1] - 2024-05-13 From 356216a492d5d48390bff2dd6c2c0a29d07a04ca Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 11:43:30 +0200 Subject: [PATCH 05/16] fix typehint --- linien-server/linien_server/influxdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linien-server/linien_server/influxdb.py b/linien-server/linien_server/influxdb.py index f23867c6..208acb30 100644 --- a/linien-server/linien_server/influxdb.py +++ b/linien-server/linien_server/influxdb.py @@ -29,7 +29,7 @@ class InfluxDBLogger: def __init__( self, credentials: InfluxDBCredentials, parameters: Parameters ) -> None: - self.credentials: InfluxDBClient = credentials + self.credentials: InfluxDBCredentials = credentials self.parameters: Parameters = parameters self.stop_event = Event() self.stop_event.set() From cb21d6d6f8183dd0e0cd7183ea3afc806f472de2 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 11:50:08 +0200 Subject: [PATCH 06/16] use health instead of ping for testing connection --- linien-server/linien_server/influxdb.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linien-server/linien_server/influxdb.py b/linien-server/linien_server/influxdb.py index 208acb30..09d7932b 100644 --- a/linien-server/linien_server/influxdb.py +++ b/linien-server/linien_server/influxdb.py @@ -97,8 +97,9 @@ def test_connection( # FIXME: This does not test the credentials, yet. status_code = 0 - message = "" - success = client.ping() + health = client.health() + message = health["message"] + success = health["status"] == "pass" return success, status_code, message def write_data( From 308837ec5b43f07d5b68028d85dbc4be0d1fb497 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 11:54:26 +0200 Subject: [PATCH 07/16] remove unused status code --- linien-gui/linien_gui/ui/logging_panel.py | 26 ++++++++--------------- linien-server/linien_server/server.py | 8 ++----- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/linien-gui/linien_gui/ui/logging_panel.py b/linien-gui/linien_gui/ui/logging_panel.py index a217565f..544a3702 100644 --- a/linien-gui/linien_gui/ui/logging_panel.py +++ b/linien-gui/linien_gui/ui/logging_panel.py @@ -33,7 +33,7 @@ class LoggingPanel(QtWidgets.QWidget): set_parameter_log = pyqtSignal(str, bool) - influx_credentials_update = pyqtSignal(bool, int, str) + influx_credentials_update = pyqtSignal(bool, str) logParametersToolButton: "LoggedParametersToolButton" lineEditURL: QtWidgets.QLineEdit @@ -106,28 +106,20 @@ def on_influx_update_button_clicked(self) -> None: bucket=self.lineEditBucket.text(), measurement=self.lineEditMeas.text(), ) - ( - success, - status_code, - message, - ) = self.control.exposed_update_influxdb_credentials(credentials) - update_msg = f"Update of InfluxDB credentials successful: {success}" - if not success: - update_msg += f" (Status {status_code}): {message}" + (success, message) = self.control.exposed_update_influxdb_credentials( + credentials + ) + update_msg = f"Update of InfluxDB credentials successful: {success}: {message}" logger.info(update_msg) - self.influx_credentials_update.emit(success, status_code, message) + self.influx_credentials_update.emit(success, message) - def on_influxdb_credentials_updated( - self, success: bool, status_code: int, message: str - ) -> None: + def on_influxdb_credentials_updated(self, success: bool, message: str) -> None: if success: self.influxTestIndicator.setText("✅") - self.influxTestIndicator.setToolTip("Connection successful") + self.influxTestIndicator.setToolTip(f"Connection successful: {message}") else: self.influxTestIndicator.setText("❌") - self.influxTestIndicator.setToolTip( - f"Connection failed: {message} (Status {status_code})" - ) + self.influxTestIndicator.setToolTip(f"Connection failed: {message}.") # checkable menu for logged parameters, inspired by diff --git a/linien-server/linien_server/server.py b/linien-server/linien_server/server.py index 56393c05..0b4e8aab 100644 --- a/linien-server/linien_server/server.py +++ b/linien-server/linien_server/server.py @@ -122,18 +122,14 @@ def exposed_update_influxdb_credentials( credentials = copy(credentials) ( connection_succesful, - status_code, message, ) = self.influxdb_logger.test_connection(credentials) if connection_succesful: self.influxdb_logger.credentials = credentials logger.info("InfluxDB credentials updated successfully") else: - logger.info( - "InfluxDB credentials update failed. Error message: " - f" {message} (Status Code {status_code})" - ) - return connection_succesful, status_code, message + logger.info(f"InfluxDB credentials update failed. Error message: {message}") + return connection_succesful, message def exposed_get_influxdb_credentials(self) -> InfluxDBCredentials: return self.influxdb_logger.credentials From 2d84123041d5f1eb0433e58d5f37938f0d40f694 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 13:01:54 +0200 Subject: [PATCH 08/16] fix return values --- linien-server/linien_server/influxdb.py | 7 ++----- linien-server/linien_server/server.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/linien-server/linien_server/influxdb.py b/linien-server/linien_server/influxdb.py index 09d7932b..295c458e 100644 --- a/linien-server/linien_server/influxdb.py +++ b/linien-server/linien_server/influxdb.py @@ -85,9 +85,7 @@ def _logging_loop(self, interval: float) -> None: self.write_data(self.credentials, data) sleep(interval) - def test_connection( - self, credentials: InfluxDBCredentials - ) -> tuple[bool, int, str]: + def test_connection(self, credentials: InfluxDBCredentials) -> tuple[bool, str]: """Write empty data to the server to test the connection""" client = InfluxDBClient( url=credentials.url, @@ -96,11 +94,10 @@ def test_connection( ) # FIXME: This does not test the credentials, yet. - status_code = 0 health = client.health() message = health["message"] success = health["status"] == "pass" - return success, status_code, message + return success, message def write_data( self, credentials: InfluxDBCredentials, fields: dict[str, ParameterValues] diff --git a/linien-server/linien_server/server.py b/linien-server/linien_server/server.py index 0b4e8aab..f2729c2b 100644 --- a/linien-server/linien_server/server.py +++ b/linien-server/linien_server/server.py @@ -118,7 +118,7 @@ def exposed_get_parameter_log(self, param_name: str) -> bool: def exposed_update_influxdb_credentials( self, credentials: InfluxDBCredentials - ) -> tuple[bool, int, str]: + ) -> tuple[bool, str]: credentials = copy(credentials) ( connection_succesful, From 2411f2675938de1d6bab6061e24fc69a7f89f210 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 13:11:30 +0200 Subject: [PATCH 09/16] fix return values --- linien-server/linien_server/influxdb.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/linien-server/linien_server/influxdb.py b/linien-server/linien_server/influxdb.py index 295c458e..3a230f34 100644 --- a/linien-server/linien_server/influxdb.py +++ b/linien-server/linien_server/influxdb.py @@ -53,7 +53,7 @@ def update_connection(self) -> InfluxDBClient: self.write_api = client.write_api(write_options=SYNCHRONOUS) def start_logging(self, interval: float) -> None: - conn_success, status_code, message = self.test_connection(self.credentials) + conn_success, message = self.test_connection(self.credentials) self.thread = Thread( target=self._logging_loop, args=(interval,), @@ -63,10 +63,7 @@ def start_logging(self, interval: float) -> None: self.stop_event.clear() self.thread.start() else: - raise ConnectionError( - "Failed to connect to InfluxDB database: " - f" {message} (Status code: {status_code})" - ) + raise ConnectionError(f"Failed to connect to InfluxDB database: {message}") def stop_logging(self) -> None: self.stop_event.set() From 80e7e42c3fbb7df22c7f978fb872cc16bb11f2f6 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 13:29:13 +0200 Subject: [PATCH 10/16] test credentials when checking influxdb connection --- linien-server/linien_server/influxdb.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/linien-server/linien_server/influxdb.py b/linien-server/linien_server/influxdb.py index 3a230f34..1d60b780 100644 --- a/linien-server/linien_server/influxdb.py +++ b/linien-server/linien_server/influxdb.py @@ -20,6 +20,7 @@ from influxdb_client import InfluxDBClient from influxdb_client.client.write_api import SYNCHRONOUS +from influxdb_client.rest import ApiException from linien_common.communication import ParameterValues from linien_common.influxdb import InfluxDBCredentials, save_credentials from linien_server.parameters import Parameters @@ -90,10 +91,26 @@ def test_connection(self, credentials: InfluxDBCredentials) -> tuple[bool, str]: org=credentials.org, ) - # FIXME: This does not test the credentials, yet. health = client.health() message = health["message"] success = health["status"] == "pass" + if success: + try: + client.write_api(write_options=SYNCHRONOUS).write( + bucket=credentials.bucket, + org=credentials.org, + record={ + "measurement": credentials.measurement, + "fields": {}, + }, + ) + except ApiException as e: + success = False + message = e.message + except Exception: + success = False + message = "Exception occurred. Check server log file for details." + return success, message def write_data( From c31e3e3f58d9de2b708649f1862d544fff66c053 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 14:01:05 +0200 Subject: [PATCH 11/16] reset influxdb test indicator on start --- linien-gui/linien_gui/ui/logging_panel.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linien-gui/linien_gui/ui/logging_panel.py b/linien-gui/linien_gui/ui/logging_panel.py index 544a3702..6256abcd 100644 --- a/linien-gui/linien_gui/ui/logging_panel.py +++ b/linien-gui/linien_gui/ui/logging_panel.py @@ -78,6 +78,10 @@ def on_connection_established(self) -> None: self.lineEditBucket.setText(credentials.bucket) self.lineEditMeas.setText(credentials.measurement) + # hide test indicator that might be set from previous connection to a different + # device + self.influxTestIndicator.setText("") + # getting the logging status from the remote log_status = self.control.exposed_get_logging_status() button_text = STOP_LOG_BUTTON_TEXT if log_status else START_LOG_BUTTON_TEXT From ee20c8ff71cd8a588bca26bd0aef14ae2b073cf3 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 14:08:06 +0200 Subject: [PATCH 12/16] fix attribute access of influxdb health status --- linien-server/linien_server/influxdb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linien-server/linien_server/influxdb.py b/linien-server/linien_server/influxdb.py index 1d60b780..e15be813 100644 --- a/linien-server/linien_server/influxdb.py +++ b/linien-server/linien_server/influxdb.py @@ -92,8 +92,8 @@ def test_connection(self, credentials: InfluxDBCredentials) -> tuple[bool, str]: ) health = client.health() - message = health["message"] - success = health["status"] == "pass" + message = health.message + success = health.status == "pass" if success: try: client.write_api(write_options=SYNCHRONOUS).write( From 702c092593332e7a37cb55148eb209652e88c043 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 14:22:03 +0200 Subject: [PATCH 13/16] bump version number --- CHANGELOG.md | 5 +++-- linien-client/pyproject.toml | 4 ++-- linien-common/pyproject.toml | 2 +- linien-gui/pyproject.toml | 4 ++-- linien-server/pyproject.toml | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71c4b519..5b229b81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +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). -## [Unreleased] +## [2.0.2] ### Fixed * Improved performance of server CLI by @bleykauf in https://github.com/linien-org/linien/pull/396 +* API token for InfluxDB is now checked by @bleykauf in https://github.com/linien-org/linien/pull/397 ## [2.0.1] - 2024-05-13 @@ -215,7 +216,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * **Bug fixes and performance improvements** -[Unreleased]: https://github.com/linien-org/linien/compare/v2.0.1...HEAD +[Unreleased]: 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 [2.0.0]: https://github.com/linien-org/linien/compare/v1.0.2...v2.0.0 [1.0.2]: https://github.com/linien-org/linien/compare/v1.0.1...v1.0.2 diff --git a/linien-client/pyproject.toml b/linien-client/pyproject.toml index c328bc4c..c4622b0f 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.1.0.dev0" +version = "2.0.2" 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>=2.7.0,<3.0", "typing_extensions>=4.5.0,<5.0", - "linien-common==2.1.0.dev0", + "linien-common==2.0.2", ] [project.readme] diff --git a/linien-common/pyproject.toml b/linien-common/pyproject.toml index 772cfbd0..3dd3c5a8 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.1.0.dev0" +version = "2.0.2" 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 ce1c2eac..f6022f4d 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.1.0.dev0" +version = "2.0.2" 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.1.0.dev0", + "linien_client==2.0.2", ] [project.readme] diff --git a/linien-server/pyproject.toml b/linien-server/pyproject.toml index 20968c30..4318a17f 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.1.0.dev0" +version = "2.0.2" 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.1.0.dev0", + "linien-common==2.0.2", ] [project.readme] From 2bd982c9275d751b8f0ed24551eb8befe01f54a2 Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 14:27:34 +0200 Subject: [PATCH 14/16] bump version of up/download-artifact --- .github/workflows/pyinstaller-linux.yml | 2 +- .github/workflows/pyinstaller-windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pyinstaller-linux.yml b/.github/workflows/pyinstaller-linux.yml index 93173268..886f0cc8 100644 --- a/.github/workflows/pyinstaller-linux.yml +++ b/.github/workflows/pyinstaller-linux.yml @@ -41,7 +41,7 @@ jobs: - run: pyinstaller pyinstaller.spec working-directory: linien-gui - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: linien-gui-linux path: linien-gui/dist/* diff --git a/.github/workflows/pyinstaller-windows.yml b/.github/workflows/pyinstaller-windows.yml index f6f78604..3db44e1d 100644 --- a/.github/workflows/pyinstaller-windows.yml +++ b/.github/workflows/pyinstaller-windows.yml @@ -28,7 +28,7 @@ jobs: - run: pyinstaller pyinstaller.spec working-directory: linien-gui - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: linien-gui-windows path: linien-gui/dist/* From 83a2d6d56513de16b499c70316467caa4091c54e Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 14:30:13 +0200 Subject: [PATCH 15/16] add release date to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b229b81..460aaeaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ 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.2] +## [2.0.2] - 2024-05-14 ### Fixed * Improved performance of server CLI by @bleykauf in https://github.com/linien-org/linien/pull/396 From e918ced904513f0e5b5fae2d32ffb3b6b7eb71ac Mon Sep 17 00:00:00 2001 From: Bastian Leykauf Date: Tue, 14 May 2024 14:32:40 +0200 Subject: [PATCH 16/16] bump version of checkout --- .github/workflows/mypy.yml | 2 +- .github/workflows/publish-pypi.yml | 2 +- .github/workflows/publish-test-pypi.yml | 2 +- .github/workflows/pyinstaller-linux.yml | 2 +- .github/workflows/pyinstaller-windows.yml | 2 +- .github/workflows/pytest.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index c217168a..0ff50aba 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Check out repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Linien uses: ./.github/actions/install-linien diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index 63fe6037..72830df2 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: lfs: "true" diff --git a/.github/workflows/publish-test-pypi.yml b/.github/workflows/publish-test-pypi.yml index 41362f70..a8028ae7 100644 --- a/.github/workflows/publish-test-pypi.yml +++ b/.github/workflows/publish-test-pypi.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: lfs: "true" diff --git a/.github/workflows/pyinstaller-linux.yml b/.github/workflows/pyinstaller-linux.yml index 886f0cc8..ead840fb 100644 --- a/.github/workflows/pyinstaller-linux.yml +++ b/.github/workflows/pyinstaller-linux.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/pyinstaller-windows.yml b/.github/workflows/pyinstaller-windows.yml index 3db44e1d..1885fa7f 100644 --- a/.github/workflows/pyinstaller-windows.yml +++ b/.github/workflows/pyinstaller-windows.yml @@ -15,7 +15,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 4fbb6daa..49359b19 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Check out repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Linien uses: ./.github/actions/install-linien