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

feat: malibu stacey and bill and ted easter eggs #37

Merged
merged 3 commits into from
Feb 18, 2024
Merged

Conversation

mikejgray
Copy link
Collaborator

@mikejgray mikejgray commented Jan 29, 2024

Addresses #28

With thanks to @KathyReid :)

@mikejgray mikejgray requested review from JarbasAl and a team January 29, 2024 04:59
@ChanceNCounter
Copy link

Visually LGTM, have not tested.

@KathyReid, could you please clarify which license you meant for the original to bear? It still seems to be carrying the "delete 2/3 of this" template of yore. I assume MIT or Apache, because this dates from after the "feh copylefted Python" eureka, but we need to specify which, so that...

@mikejgray ^ that done, please amend LICENSE to reflect that the skill is released under the Apache license 2.0, but portions derive from, list the parents and their licenses, credit the authors (Kathy in this case.) Then a break, then the full text of the license as it currently looks

@mikejgray
Copy link
Collaborator Author

@KathyReid Bump - I'd love to incorporate your Malibu Stacey work into this skill, but as Chance said, we want to make sure we get the correct licensing information.

@mikejgray
Copy link
Collaborator Author

Hi @KathyReid, I'm sure you're busy. When you get a chance would you please share the original intent for the Malibu Stacey skill license? Thank you!

@KathyReid
Copy link

Hey @mikejgray, firstly apologies for the radio silence, deep in PhD land. I'm totally open to whatever licence works best for OpenVoiceOS, however the bigger issue I see here is the licensing of the Malibu Stacey content itself - I took it from the internet somewhere, but I don't think it is open licensed. Can we claim fair use here? Not sure? And also not sure if that applies to jurisdictions outside of the United States.

Best, Kathy

@mikejgray
Copy link
Collaborator Author

@KathyReid No worries whatsoever! Thank you for responding. We'll stick with the Apache 2.0 license on the rest of the skill then. As for fair use...I'm not a lawyer, but I definitely see your point. I replaced the licensed sounds with some TTS-generated sounds instead (Nabu Casa cloud TTS, American English, Sara Neural). That should be less of an issue, I would imagine.

@mikejgray mikejgray merged commit bb17fed into dev Feb 18, 2024
13 checks passed
@mikejgray mikejgray deleted the FEAT_MoreEggs branch June 10, 2024 01:10
@github-actions github-actions bot mentioned this pull request Jul 5, 2024
mikejgray added a commit that referenced this pull request Jul 18, 2024
* Increment Version

* fix: correction to version.py

* fix: release automation (#20)

* fix: release automation

* fix: setup looks for correct version

* fix: adjust version location

* Increment Version to

* Update Changelog

* chore: versioning

* Increment Version to

* Update Changelog

* version

* Increment Version to

* Update Changelog

* Increment Version to

* fix: alpha release flow

* Increment Version to 0.1.2a1

* Update Changelog

* chore: Make README.md examples fit typical style (#22)

The prior copy looked out of place in the rest of the homescreen
examples, which are all capitalized and end in punctuation.

* Update skill.json

* more stt mistranscriptions for DukeNukemKeyword.voc (#26)

* Increment Version to 0.1.2a2

* Update Changelog

* update imports (#30)

* update imports

remove invalid license header, boilerplate copy paste from ancient times

I'm the original author, in case of doubt the GPL license in header does not apply

* Update skill.json

---------

Co-authored-by: JarbasAl <JarbasAl@users.noreply.github.com>

* Increment Version to 0.1.2a3

* Update Changelog

* chore: standardize naming, move files to locale dir (#32)

* chore: standardize naming, move files to locale dir

* Increment Version to 0.1.2a4

* Update Changelog

* feat: portal ocp (#35)

* tests

* feat: glados mp3s to OCP playback

* use OCP API, stub and start writing tests

* Update skill.json

* rename unit test file

* broader coverage

* syntax

* remove 3.12 tests

resolves ModuleNotFoundError: No module named 'setuptools'

* remove errant todo

* remove unsupported use case

* remove confusing and unnecessary section from README

* Update skill.json

---------

Co-authored-by: mikejgray <mikejgray@users.noreply.github.com>

* Increment Version to 0.1.2a5

* Update Changelog

* feat: best in life (#34)

* feat: what is best in life?

* tests

* add resources

* drop explicit 3.7 support

Since this isn't a default skill anywhere, users must install it explicitly, so maintaining support for EOL Python doesn't make a ton of sense. Plus it's making the tests fail.

* Increment Version to 0.1.2a6

* Update Changelog

* feat: malibu stacey and bill and ted easter eggs (#37)

* feat: malibu stacey and bill and ted easter eggs
Addresses #28

* bump minerva version to ovos-workshop compat

* remove copyrighted sounds

* Increment Version to 0.1.2a7

* Update Changelog

* automations/translations

* translations/allow_UNUSED_keywords

* Increment Version to 0.1.2a8

* Update Changelog

* Re-enable intent tests (#39)

* Update skill.json

* feat: singing (#40)

* feat: singing skill port
Closes #2
* feat: container support

If the environment variable is set indicating OVOS is running in a container, pass the GitHub URL of the file to OCP instead of the local URL. Naturally only works if the assistant has an internet connection to GitHub.

Co-authored-by: mikejgray <mikejgray@users.noreply.github.com>

* Increment Version to 0.1.2a9

* Update Changelog

* feat: make it snow (#33)

* feat: snow on Christmas

* Increment Version to 0.1.2a10

* Update Changelog

* fix: laws of robotics (#43)

* fix: laws of robotics

Only one law at a time when requesting a specific law

* Increment Version to 0.1.2a11

* Update Changelog

* Increment Version to 1.0.0

---------

Co-authored-by: mikejgray <mikejgray@users.noreply.github.com>
Co-authored-by: Mike Gray <mike@graywind.org>
Co-authored-by: AJ Jordan <alex@strugee.net>
Co-authored-by: JarbasAI <33701864+JarbasAl@users.noreply.github.com>
Co-authored-by: JarbasAl <JarbasAl@users.noreply.github.com>
Co-authored-by: miro <jarbasai@mailfence.com>
Co-authored-by: Daniel McKnight <34697904+NeonDaniel@users.noreply.github.com>
@mikejgray mikejgray mentioned this pull request Jul 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants