Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.3.0 #60

Merged
merged 8 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ jobs:
needs: build_and_publish_pypi_and_release
uses: neongeckocom/.github/.github/workflows/publish_docker.yml@master
secrets: inherit
with:
platforms: linux/amd64,linux/arm64
4 changes: 3 additions & 1 deletion .github/workflows/publish_test_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ jobs:
build_and_publish_docker:
needs: publish_alpha_release
uses: neongeckocom/.github/.github/workflows/publish_docker.yml@master
secrets: inherit
secrets: inherit
with:
platforms: linux/amd64,linux/arm64
7 changes: 3 additions & 4 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

name: Run Unit Tests
on:
push:
workflow_dispatch:
pull_request:
branches:
- master

jobs:
py_build_tests:
Expand All @@ -15,6 +12,8 @@ jobs:
python_version: "3.8"
docker_build_tests:
uses: neongeckocom/.github/.github/workflows/docker_build_tests.yml@master
with:
platforms: linux/amd64,linux/arm64
unit_tests:
timeout-minutes: 15
strategy:
Expand Down Expand Up @@ -51,4 +50,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: gui-service-test-results
path: tests/gui-service-test-results.xml
path: tests/gui-service-test-results.xml
22 changes: 19 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,28 @@
# Changelog

## [1.2.2a1](https://github.com/NeonGeckoCom/neon_gui/tree/1.2.2a1) (2023-08-25)
## [1.2.3a3](https://github.com/NeonGeckoCom/neon_gui/tree/1.2.3a3) (2024-03-11)

[Full Changelog](https://github.com/NeonGeckoCom/neon_gui/compare/1.2.1...1.2.2a1)
[Full Changelog](https://github.com/NeonGeckoCom/neon_gui/compare/1.2.3a2...1.2.3a3)

**Merged pull requests:**

- Update GUI display data to account for "NeonOS 2.0" image metadata [\#55](https://github.com/NeonGeckoCom/neon_gui/pull/55) ([NeonDaniel](https://github.com/NeonDaniel))
- Update shell metadata handling [\#59](https://github.com/NeonGeckoCom/neon_gui/pull/59) ([NeonDaniel](https://github.com/NeonDaniel))

## [1.2.3a2](https://github.com/NeonGeckoCom/neon_gui/tree/1.2.3a2) (2024-01-30)

[Full Changelog](https://github.com/NeonGeckoCom/neon_gui/compare/1.2.3a1...1.2.3a2)

**Merged pull requests:**

- feat: upgrades dockerfile to python3.10-slim [\#58](https://github.com/NeonGeckoCom/neon_gui/pull/58) ([dblencowe](https://github.com/dblencowe))

## [1.2.3a1](https://github.com/NeonGeckoCom/neon_gui/tree/1.2.3a1) (2024-01-23)

[Full Changelog](https://github.com/NeonGeckoCom/neon_gui/compare/1.2.2...1.2.3a1)

**Merged pull requests:**

- feat: Adds arm64 docker image builds [\#57](https://github.com/NeonGeckoCom/neon_gui/pull/57) ([dblencowe](https://github.com/dblencowe))



Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-slim
FROM python:3.10-slim

LABEL vendor=neon.ai \
ai.neon.name="neon-gui"
Expand Down
9 changes: 7 additions & 2 deletions neon_gui/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

from ovos_bus_client import Message
from ovos_utils.log import LOG
from ovos_utils.log import LOG, log_deprecation
from ovos_utils.gui import extend_about_data
from datetime import datetime

Expand Down Expand Up @@ -79,9 +79,14 @@ def add_neon_about_data():
build_info = json.load(f)
if build_info.get("image", {}).get("version"):
# Neon OS 2.0; use neon-debos version
extra_data.append({"display_key": "Neon OS",
extra_data.append({"display_key": "Neon Debos",
"display_value": build_info['image']['version']})
if build_info.get("build_version"):
extra_data.insert(0, {"display_key": "Neon OS",
"display_value": build_info["build_version"]})
else:
log_deprecation("Legacy image metadata support is deprecated",
"1.3")
extra_data.extend(_get_legacy_image_metadata(build_info,
core_version))
except FileNotFoundError:
Expand Down
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

__version__ = "1.2.2"
__version__ = "1.3.0"
Loading