Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
bleykauf committed May 29, 2024
2 parents 76041ae + 8bca16f commit af89325
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 11 deletions.
15 changes: 12 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
* Handle corrupted json files by @bleykauf in https://github.com/linien-org/linien/pull/399
* Show differences when local and remote parameters do not match by @bleykauf in https://github.com/linien-org/linien/pull/400
* Show voltage on the x-axis when sweeping by @bleykauf in https://github.com/linien-org/linien/pull/404

## [2.0.3] - 2024-05-29

### Fixed
* Now compatible with Python 3.12 by bumping version of `fabric` by @bleykauf in https://github.com/linien-org/linien/pull/406, thanks to @systemofapwne for reporting this issue

### Added
* Handle corrupted json files by @bleykauf in https://github.com/linien-org/linien/pull/399


## [2.0.2] - 2024-05-14

### Fixed
Expand Down Expand Up @@ -223,8 +231,9 @@ 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
[v2.0.2]: https://github.com/linien-org/linien/compare/v2.0.1...v2.0.2
[Unreleased]: https://github.com/linien-org/linien/compare/v2.0.3...HEAD
[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
[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
Expand Down
6 changes: 3 additions & 3 deletions linien-client/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "linien-client"
version = "2.1.0.dev0"
version = "2.0.3"
authors = [
{ name = "Benjamin Wiegand", email = "[email protected]" },
{ name = "Bastian Leykauf", email = "[email protected]" },
Expand All @@ -23,9 +23,9 @@ classifiers = [
]
requires-python = ">=3.8"
dependencies = [
"fabric>=2.7.0,<3.0",
"fabric>=3.2.2,<4.0",
"typing_extensions>=4.5.0,<5.0",
"linien-common==2.1.0.dev0",
"linien-common==2.0.3",
]

[project.readme]
Expand Down
2 changes: 1 addition & 1 deletion linien-common/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "linien-common"
version = "2.1.0.dev0"
version = "2.0.3"
authors = [
{ name = "Benjamin Wiegand", email = "[email protected]" },
{ name = "Bastian Leykauf", email = "[email protected]" },
Expand Down
4 changes: 2 additions & 2 deletions linien-gui/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "linien-gui"
version = "2.1.0.dev0"
version = "2.0.3"
authors = [
{ name = "Benjamin Wiegand", email = "[email protected]" },
{ name = "Bastian Leykauf", email = "[email protected]" },
Expand All @@ -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.3",
]

[project.readme]
Expand Down
4 changes: 2 additions & 2 deletions linien-server/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "linien-server"
version = "2.1.0.dev0"
version = "2.0.3"
authors = [
{ name = "Benjamin Wiegand", email = "[email protected]" },
{ name = "Bastian Leykauf", email = "[email protected]" },
Expand All @@ -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.3",
]

[project.readme]
Expand Down

0 comments on commit af89325

Please sign in to comment.