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

Refactor requirements to read from files #15

Merged
merged 4 commits into from Feb 7, 2022

Conversation

NeonDaniel
Copy link
Member

Add loose dependency specs to all requirements
Closes #5

Add loose dependency specs to all requirements
requirements/extras.txt Outdated Show resolved Hide resolved
requirements/extras.txt Outdated Show resolved Hide resolved
@@ -0,0 +1,9 @@
phoneme_guesser~=0.1
mycroft-messagebus-client~=0.9.1,!=0.9.2,!=0.9.3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'Splainit? I believe you, though.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.9.2 and 0.9.3 had the questionable license change; it probably doesn't matter since it was later resolved, but Mycroft blacklisted those versions from their own code, so I got in the habit of doing the same..

Ignoring license, this probably could be ~=0.9

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. I didn't make the connection.

requirements/requirements.txt Outdated Show resolved Hide resolved
requests~=2.26
json_database~=0.5
kthread~=0.2
pyxdg~=0.27
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was supposed to be swapped for xdg and some manual code because LGPL

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the package spec'd in ovos-core and mycroft-core.. refactoring this should be fine, but just a note that it adds another dependency to most installations. I think the refactor will also require some code changes and thus be out of scope for this PR

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's probably worth escalating, considering.

@JarbasAl JarbasAl merged commit 0c642f3 into OpenVoiceOS:dev Feb 7, 2022
@NeonDaniel NeonDaniel deleted the ORG_RefactorDependencySpecs branch February 8, 2022 00:04
@JarbasAl JarbasAl added the refactor code improvements with no functional changes label Feb 25, 2022
NeonDaniel added a commit to NeonDaniel/ovos_utils that referenced this pull request Apr 13, 2023
* Adds checked path to log that root config path was not found

* release0.0.12/extract get_local_settings and save_settings from ovos-core (#4)

authored-by: jarbasai <jarbasai@mailfence.com>

* add notification api change and style parameter (OpenVoiceOS#6)

* fix/dict_nested_delete

* refactor/improve_enclosure_api (OpenVoiceOS#8)

update enclosure API to match mycroft-core (add missing methods/args)

ensure skill_id is always added to message.context

authored-by: jarbasai <jarbasai@mailfence.com>

* feat/more_file_utils (OpenVoiceOS#9)

authored-by: jarbasai <jarbasai@mailfence.com>

* Feat/better stop watch (OpenVoiceOS#10)

* feat/better_stop_watch
adds new property delta to stopwatch class
authored-by: jarbasai <jarbasai@mailfence.com>

* Ovos conf (OpenVoiceOS#12)

* feat/ovos.conf support

authored-by: jarbasai <jarbasai@mailfence.com>

* fix/play_audio (OpenVoiceOS#14)

* fix/play_audio

authored-by: jarbasai <jarbasai@mailfence.com>

* Refactor requirements to read from files (OpenVoiceOS#15)

* Refactor requirements to read from files
Add loose dependency specs to all requirements

* Add extra dependency installation to unit tests

* Fix typo in setup.py extra requirements

* Update dependencies based on feedback

authored-by: Daniel McKnight <daniel@neon.ai>

* Loosen dependency versions for OVOS image compat (OpenVoiceOS#16)

authored-by: Daniel McKnight <daniel@neon.ai>

* refactor/deprecate_inflection (OpenVoiceOS#19)

* refactor/deprecate_inflection
authored-by: jarbasai <jarbasai@mailfence.com>

* feat/license tests workflow (OpenVoiceOS#22)

authored-by: jarbasai <jarbasai@mailfence.com>

* Update license_tests.yml

* refactor/bump_requests (OpenVoiceOS#20)

* refactor/bump_requests

bump min version to avoid GPL transient dependency (chardet)

authored-by: jarbasai <jarbasai@mailfence.com>

* refactor/replace_pyxdg (OpenVoiceOS#21)

authored-by: jarbasai <jarbasai@mailfence.com>

* fix/xdg paths in non-mycroft installs

release 0.0.14

intermediate release on the way to 0.1.0

* fix/fallback_mycroft.conf

ensure a fallback mycroft.conf is available to provide default values in non mycroft installs

release 0.0.15

intermediate release on the way to 0.1.0

* Add back colour dependency (OpenVoiceOS#24)

Co-authored-by: Daniel McKnight <daniel@neon.ai>

* Add user config home to `get_xdg_config_dirs` (OpenVoiceOS#23)

authored-by: Daniel McKnight <daniel@neon.ai>

* Update license_tests.yml (OpenVoiceOS#26)

* Feat/pypi workflow (OpenVoiceOS#25)

* feat/pypi_workflow

authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* Fix typo in configuration paths

* Increment Version

* fix/ovos.conf reading (OpenVoiceOS#28)

authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* Feat/diagnostic mode (OpenVoiceOS#18)

* feat/diagnostic_mode

authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* feat/packaging workflows (OpenVoiceOS#29)

* feat/packaging workflows

authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* Delete publish_test_build.yml

* feat/packaging workflows (OpenVoiceOS#30)

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* Handle stopwatch.stop before started (OpenVoiceOS#31)

* Handle stopwatchj.stop before started
Add stopwatch unit tests (duplicated from neon-utils)

* Add repo checkout handling for forked repos

* Fix typo in checkout action

* Fix checkout action repository reference
Add names to identify which checkout step runs

* Debug GH envvars

* Fix typo in GH envvar spec

authored-by: Daniel McKnight <daniel@neon.ai>

* Increment Version

* Update version.py

manually fix version mess up during workflow setup

* fix changelog text

* feat/packaging workflows (OpenVoiceOS#32)

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Refactor/remove deprecated (OpenVoiceOS#11)

* refactor/remove_deprecated

* deprecate color utils

Deprecate parse utils extracted from wikipedia_for_humans

* rm tests

* tests

* rm parse tests

* 0.1.0a1

* rm old tests

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* fix/platform_detect (OpenVoiceOS#33)

authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* Declare alpha stable

* Prepare Next Version

* Fix/resolve resource file (OpenVoiceOS#34)

* fix/platform_detect

* fix/resolve_resource_file

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* add process_utils.py (OpenVoiceOS#35)

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* feat/list_utils (OpenVoiceOS#36)

add util to flatten list, taken from quebra_frases

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* notify matrix chat on PR merged (OpenVoiceOS#37)

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Adds ovos service api (OpenVoiceOS#38)

* Increment Version

* Declare alpha stable

* Prepare Next Version

* Fix/adapt (OpenVoiceOS#39)

* fix/optional_adapt

adapt should not be imported

authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* Fix/remove unused dep (OpenVoiceOS#40)

* add process_utils.py

* notify matrix chat on PR merged

* rm pyaml dependency

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* add sdist (OpenVoiceOS#41)

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* refactor/no_adapt (OpenVoiceOS#42)

some helper classes providing only syntactic sugar required adapt-parser, these have been refactored and moved into ovos_utils to avoid dragging adapt-parser dependency (except for skills service)

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* Add widgets helper (OpenVoiceOS#43)

* add widgets helper

* move logging to debug

* Increment Version

* add InputDeviceHelper to detect available inputs on current system (OpenVoiceOS#44)

* add InputDeviceHelper to detect available inputs on current system

* add exception if libinput not found, rename check functions for ease of use

* add easy access functions to input helper

* Increment Version

* Declare alpha stable

* Prepare Next Version

* support ovos-shell (OpenVoiceOS#45)

latest version of ovos-shell renamed the binary

* Increment Version

* feat/lang_utils (OpenVoiceOS#47)

helper methods to retrieve active language from bus messages and lingua_franca
authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* fix/full_lang (OpenVoiceOS#48)

lang utils were using wrong LF method and not returning the full lang code

this causes issues when 4 letter code is expected

this commit makes the default_lang use the proper LF method and return a full lang code

authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* Declare alpha stable

* Prepare Next Version

* fix/screen_check (OpenVoiceOS#49)

in systems without X server running and without matplotlib this method wrongly reports no screen

add an extra check for raspberry devices, this fixes the issue in OpenVoiceOS image at least, further improvements should be investigated

* Increment Version

* fix/allow_LF_lang_to_be_None (OpenVoiceOS#50)

* fix/allow_LF_lang_to_be_None

* Update configuration.py

* Increment Version

* Prevent raising exception when msm config not present (OpenVoiceOS#51)

Co-authored-by: Daniel McKnight <daniel@neon.ai>

* Increment Version

* Loosen mycroft-messagebus-client dependency (OpenVoiceOS#53)

* Increment Version

* port/file_watcher (OpenVoiceOS#54)

migrate FileWatcher class from ovos_config for reuse

authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* refactor/use ovos_config package (OpenVoiceOS#52)

* Patch LocalConf to handle yaml configuration

* Refactor config on ovos-config package

* Resolve circular import

* Roll back added yaml methods

* Log deprecation warning

* Update configuration to implement ovos_config

* Fix minimum ovos_config version to resolve a real version

* Add missing xdg location import

* Bump ovos_config dependency spec

Co-authored-by: Daniel McKnight <daniel@neon.ai>

* Increment Version

* Update release tag workflows to include version change commits (OpenVoiceOS#56)

Co-authored-by: Daniel McKnight <daniel@neon.ai>

* Skill location utilities (OpenVoiceOS#55)

* Add utilities for getting skill locations (install directories and plugin root directories)

* Address PR feedback
Update docstrings
Add unit tests with bugfixes

* Fix path error in `get_installed_skill_ids`

* Allow skill location utils to work without OPM dependency

* Cleanup skill directory parsing for better readability

* Actually make sure order is preserved in extra_directories and make code more readable

authored-by: Daniel McKnight <daniel@neon.ai>

* Increment Version

* Declare alpha stable

* Prepare Next Version

* Add extend about data method to gui utils (OpenVoiceOS#57)

* Add extend about data method to gui utils

* add bus arg to method

* fix arg position

* Increment Version

* Handle exceptions getting cache directory when MemoryTempfile fails (i.e. in a chroot) (OpenVoiceOS#58)

Co-authored-by: Daniel McKnight <daniel@neon.ai>

* Increment Version

* feat/ovos_api (OpenVoiceOS#60)

* feat/ovos_api

add helper classes for all ovos api endpoints

* add more end points

Co-authored-by: Aditya Mehra <aix.m@outlook.com>

* Increment Version

* add systemctl mycroft restart option (OpenVoiceOS#61)

* add systemctl mycroft restart option

* rename function

* Increment Version

* Declare alpha stable

* Prepare Next Version

* add more api methods (OpenVoiceOS#62)

* add more api methods

* fix review items

* Increment Version

* Add method to restart arbitrary systemd service (OpenVoiceOS#63)

* Allow passing a service name to restart to support other images

* Refactor changes to function names make sense
Add docstrings

Co-authored-by: Daniel McKnight <daniel@neon.ai>

* Increment Version

* fix/syntax_error (OpenVoiceOS#64)

missing comma

* Increment Version

* feat/timed_lru_cache (OpenVoiceOS#65)

new util, decorator for caching function results for X seconds

used in selene api, but also useful as a generic util across other packages

* Increment Version

* Add methods for controlled notifications (OpenVoiceOS#66)

* Increment Version

* Add geolocate methods support in ovos_api_service (OpenVoiceOS#67)

* Increment Version

* feat/email_utils (OpenVoiceOS#68)

extracted from personal backend for reuse across packages

* Increment Version

* Update log.py (OpenVoiceOS#69)

* Update log.py

by default make logger print to stdout and save to XDG paths with log rotation

* xdg_state

* Increment Version

* remove "logs" subfolder (OpenVoiceOS#70)

* Increment Version

* Update `ovos_config` references, Read config in `get_mycroft_bus` (OpenVoiceOS#72)

* Update config references to ovos_configuration
Update `get_mycroft_bus` to use configuration
Closes OpenVoiceOS#71

* Update default values in `get_mycroft_bus`

Co-authored-by: Daniel McKnight <daniel@neon.ai>

* Increment Version

* add mail api point to ovos api service (OpenVoiceOS#73)

* Increment Version

* feat/xinput support (OpenVoiceOS#74)

* feat/xinput support

add support for `xinput list` for mouse detection

* revert debug logs

* Increment Version

* scan /dev/input for device detection (OpenVoiceOS#75)

* scan /dev/input for device detection

* fix xinput, filter virtual test devices

* fix xinput, filter virtual test devices

* Increment Version

* fallback to True for mouse detection if libinput is missing (OpenVoiceOS#76)

* Increment Version

* fix input detect again (OpenVoiceOS#77)

seems like in some platforms the calls to libinput and xinput may throw random errors, lets protect against that

Reported by @emphasize

* Increment Version

* license + vulnerability tests (OpenVoiceOS#78)

* Declare alpha stable

* Prepare Next Version

* feat/event_wrappers_in_outils (OpenVoiceOS#79)

shared logic in central utils package

* Increment Version

* refactor some stuff to properties for better compatibility with ovos-core (OpenVoiceOS#80)

* Increment Version

* Declare alpha stable

* Prepare Next Version

* fix sudo flag (OpenVoiceOS#82)

* Increment Version

* fix sudo flag again (OpenVoiceOS#83)

Co-authored-by: Guy Martin <gmsoft@tuxicoman.be>

* Update system.py

* Increment Version

* gui notification callback data (OpenVoiceOS#84)

* add callback data to show notification

* do not send none type but specify exact type

* Increment Version

* Add background_color to show image and show animated image (OpenVoiceOS#86)

* Add background_color to show image and show animated image

* fix docstring

* Increment Version

* sync utils with core (OpenVoiceOS#89)

* sync utils with core

- make audio utils compatible and move missing helpers
- sync duplicated intent service utils

* sync EventSchedulerInterface

* audio unittests

* Increment Version

* fix/mouse_detect_again (OpenVoiceOS#90)

* Increment Version

* add transient duration config (OpenVoiceOS#92)

* Increment Version

* Log deprecation warning in `layers` module (OpenVoiceOS#93)

* Log deprecation warning in `layers` module

* Ignore known setuptools pip-audit error

* Increment Version

* Declare alpha stable

* Prepare Next Version

* According to the usage, you should be able to pass the name to LOG(). (OpenVoiceOS#94)

* Increment Version

* feat/network_reqs_from_workshop (OpenVoiceOS#96)

move shared utils from workshop for usage across more projects

* Increment Version

* feat/runtime_requirements gui (OpenVoiceOS#97)

* Increment Version

* minor utils fix (OpenVoiceOS#98)

* minor utils fix

* bump ovos utils

* Increment Version

* improve network checks (OpenVoiceOS#88)

* improve network checks

* portal check

* Increment Version

* Handle default network config values if core configuration is incomplete (OpenVoiceOS#99)

* Increment Version

* Refactor SSH helpers and add generic systemd helpers (OpenVoiceOS#95)

* Add service enable/disable/active methods
Refactor ssh_enable/ssh_disable to use new methods

* --user flag

* Update system.py

* docstrs

* typo

---------

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

* Increment Version

* Declare alpha stable

* Prepare Next Version

* Migrate/lock monotonic event (OpenVoiceOS#100)

* PIDLock from core

* feat/bump_ovos_utils

* them imports

* Increment Version

* fix/circular_import (OpenVoiceOS#101)

raises AttributeError instead of ImportError

* Increment Version

* Declare alpha stable

* Prepare Next Version

* Implement module_property decorator with unit test (OpenVoiceOS#103)

* Implement module_property decorator with unit test

* Resolve bug in added test

* Increment Version

* feat/console_scripts (OpenVoiceOS#105)

* feat/console_scripts

each method here is a entrypoint define in setup.py, each corresponds to a cli util

```
    entry_points={
        'console_scripts': [
            'ovos-listen=ovos_utils.scripts:ovos_listen',
            'ovos-speak=ovos_utils.scripts:ovos_speak',
            'ovos-say_to=ovos_utils.scripts:ovos_say_to',
        ]
    }

```

* typo

* Increment Version

* Bump ovos-config dependency cleanup module init (OpenVoiceOS#104)

* Bump ovos-config dependency and remove import patch

* Move ovos_config import to troubleshoot init bugs

* More init troubleshooting

* Refactor PIDLock init to wait for config init
Annotate future deprecation in ovos-utils

* use Configuration

---------

Co-authored-by: jarbasai <jarbasai@mailfence.com>

* Increment Version

* Update dependencies to stable versions (OpenVoiceOS#107)

* Increment Version

* Declare alpha stable

* Prepare Next Version

* add show input box method for skills (OpenVoiceOS#109)

* Increment Version

* refactor/ovos-bus-client (OpenVoiceOS#110)

* refactor/ovos-bus-client

* circular import

* scripts module

* Increment Version

* feat/FakeMessage (OpenVoiceOS#111)

circular import

refactor/ovos-bus-client

* Increment Version

* Update rapidfuzz dependency (OpenVoiceOS#112)

* Increment Version

* fix/missing_dependency (OpenVoiceOS#114)

* Increment Version

* fix/missing_dependency (OpenVoiceOS#115)

* Increment Version

* feat/PKGBUILD (OpenVoiceOS#116)

* Update publish_AUR.yml

* Feat/optional ovos config (OpenVoiceOS#106)

* Increment Version

* Update input device checks (OpenVoiceOS#81)

Co-authored-by: Daniel McKnight <daniel@neon.ai>

* Increment Version

* add back wrapper around removed methods (OpenVoiceOS#118)

* Increment Version

* fix/bus compat (OpenVoiceOS#121)

* Increment Version

* Deprecate internal `ovos_config.config` references (OpenVoiceOS#122)

* Increment Version

* feat/native_OCP (OpenVoiceOS#120)

* Increment Version

* [log] Only creates directory if not stdout (OpenVoiceOS#125)

* Increment Version

* Update docstrings, annotate deprecation, and outline unit tests (OpenVoiceOS#119)

* Increment Version

* WIP release automation changes

* Update `propose_release` to support added changelog actions
Update `publish_alpha` to use shared actions
Remove unused scripts

* Disable publish automations for testing

---------

Co-authored-by: JarbasAI <33701864+JarbasAl@users.noreply.github.com>
Co-authored-by: Aditya Mehra <aix.m@outlook.com>
Co-authored-by: jarbasai <jarbasai@mailfence.com>
Co-authored-by: ChanceNCounter <ChanceNCounter@icloud.com>
Co-authored-by: NeonJarbas <59943014+NeonJarbas@users.noreply.github.com>
Co-authored-by: Daniel McKnight <daniel@neon.ai>
Co-authored-by: JarbasAl <JarbasAl@users.noreply.github.com>
Co-authored-by: ChanceNCounter <ChanceNCounter@users.noreply.github.com>
Co-authored-by: NeonDaniel <NeonDaniel@users.noreply.github.com>
Co-authored-by: Guy Martin <gmsoft@tuxicoman.be>
Co-authored-by: emphasize <swen_g@t-online.de>
Co-authored-by: AIIX <AIIX@users.noreply.github.com>
Co-authored-by: Gaëtan Trellu <gaetan.trellu@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactor code improvements with no functional changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dependencies are duplicated + add version specs
3 participants