Skip to content

Commit

Permalink
Merge branch 'dev' into fix/reqs
Browse files Browse the repository at this point in the history
  • Loading branch information
JarbasAl authored Nov 18, 2024
2 parents 0961566 + 516ebfe commit c1fddab
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
14 changes: 3 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
# Changelog

## [0.2.11a2](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.11a2) (2024-11-15)
## [0.2.12a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.12a1) (2024-11-18)

[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.11a1...0.2.11a2)
[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.11...0.2.12a1)

**Merged pull requests:**

- fix: Update skills-gui.txt [\#597](https://github.com/OpenVoiceOS/ovos-core/pull/597) ([JarbasAl](https://github.com/JarbasAl))

## [0.2.11a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.11a1) (2024-11-12)

[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.10...0.2.11a1)

**Merged pull requests:**

- Update combo-lock requirement from \<0.3,\>=0.2.2 to \>=0.2.2,\<0.4 in /requirements [\#585](https://github.com/OpenVoiceOS/ovos-core/pull/585) ([dependabot[bot]](https://github.com/apps/dependabot))
- Update ovos-skill-homescreen requirement from \<3.0.0,\>=1.0.4 to \>=1.0.4,\<4.0.0 in /requirements [\#602](https://github.com/OpenVoiceOS/ovos-core/pull/602) ([dependabot[bot]](https://github.com/apps/dependabot))



Expand Down
4 changes: 2 additions & 2 deletions ovos_core/version.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# START_VERSION_BLOCK
VERSION_MAJOR = 0
VERSION_MINOR = 2
VERSION_BUILD = 11
VERSION_ALPHA = 0
VERSION_BUILD = 12
VERSION_ALPHA = 1
# END_VERSION_BLOCK

# for compat with old imports
Expand Down
2 changes: 1 addition & 1 deletion requirements/skills-gui.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ovos-skill-homescreen>=3.0.1,<4.0.0
ovos-skill-screenshot>=0.0.2,<1.0.0
ovos-skill-local-media>=0.2.1,<1.0.0
ovos-skill-local-media>=0.2.1,<1.0.0

0 comments on commit c1fddab

Please sign in to comment.