From d140ccd5e475e71db8cb2e60e776e4567dc6bbfd Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Wed, 11 Sep 2024 19:19:03 +0100 Subject: [PATCH 1/3] feat:extras_requirements (#40) * feat:extras_requirements default plugins that should be bundled in a "full" install --- .github/workflows/build_tests.yml | 6 +++++- requirements/extras.txt | 3 +++ requirements/linux.txt | 3 +++ requirements/mac.txt | 1 + requirements/mk1.txt | 1 + requirements/mk2.txt | 1 + requirements/mk2dev.txt | 1 + setup.py | 8 ++++++++ 8 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 requirements/extras.txt create mode 100644 requirements/linux.txt create mode 100644 requirements/mac.txt create mode 100644 requirements/mk1.txt create mode 100644 requirements/mk2.txt create mode 100644 requirements/mk2dev.txt diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 626cc19..4c1414c 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -31,6 +31,10 @@ jobs: uses: actions/setup-python@v1 with: python-version: 3.8 + - name: Install System Dependencies + run: | + sudo apt-get update + sudo apt install libasound2-dev - name: Install Build Tools run: | python -m pip install build wheel @@ -39,4 +43,4 @@ jobs: python setup.py bdist_wheel - name: Install package run: | - pip install . + pip install .[extras,linux] diff --git a/requirements/extras.txt b/requirements/extras.txt new file mode 100644 index 0000000..c597f36 --- /dev/null +++ b/requirements/extras.txt @@ -0,0 +1,3 @@ +ovos-phal-plugin-ipgeo>=0.0.1,<1.0.0 +ovos-PHAL-plugin-connectivity-events>=0.0.1,<1.0.0 +ovos-PHAL-plugin-oauth>=0.0.1,<1.0.0 \ No newline at end of file diff --git a/requirements/linux.txt b/requirements/linux.txt new file mode 100644 index 0000000..ee42b8d --- /dev/null +++ b/requirements/linux.txt @@ -0,0 +1,3 @@ +ovos-phal-plugin-alsa>=0.0.1,<1.0.0 +ovos-phal-plugin-system>=0.0.1,<1.0.0 +ovos-PHAL-plugin-network-manager>=0.0.1,<2.0.0 \ No newline at end of file diff --git a/requirements/mac.txt b/requirements/mac.txt new file mode 100644 index 0000000..201e015 --- /dev/null +++ b/requirements/mac.txt @@ -0,0 +1 @@ +ovos-phal-plugin-mac>=0.0.1,<1.0.0 \ No newline at end of file diff --git a/requirements/mk1.txt b/requirements/mk1.txt new file mode 100644 index 0000000..76dab46 --- /dev/null +++ b/requirements/mk1.txt @@ -0,0 +1 @@ +ovos-PHAL-plugin-mk1>=0.0.1,<1.0.0 \ No newline at end of file diff --git a/requirements/mk2.txt b/requirements/mk2.txt new file mode 100644 index 0000000..591fe05 --- /dev/null +++ b/requirements/mk2.txt @@ -0,0 +1 @@ +# TODO - led plugin needed \ No newline at end of file diff --git a/requirements/mk2dev.txt b/requirements/mk2dev.txt new file mode 100644 index 0000000..77a1e5a --- /dev/null +++ b/requirements/mk2dev.txt @@ -0,0 +1 @@ +ovos-PHAL-plugin-mk2-fan-control>=0.0.1,<1.0.0 \ No newline at end of file diff --git a/setup.py b/setup.py index a57e989..eb0fe1d 100644 --- a/setup.py +++ b/setup.py @@ -59,6 +59,14 @@ def required(requirements_file): version=get_version(), packages=['ovos_PHAL'], install_requires=required("requirements/requirements.txt"), + extras_require={ + "extras": required("requirements/extras.txt"), + "linux": required("requirements/linux.txt"), + "mac": required("requirements/mac.txt"), + "mk1": required("requirements/mk1.txt"), + "mk2": required("requirements/mk2.txt"), + "mk2dev": required("requirements/mk2dev.txt") + }, package_data={'': package_files('ovos_PHAL')}, url='https://github.com/OpenVoiceOS/ovos-PHAL', description="Plugin based Hardware Abstraction Layer for OVOS", From 4e3a156c96338eee8144dd9440210625c24af258 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 11 Sep 2024 18:19:27 +0000 Subject: [PATCH 2/3] Increment Version to 0.2.0a1 --- ovos_PHAL/version.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ovos_PHAL/version.py b/ovos_PHAL/version.py index bbc2a72..59c1ec1 100644 --- a/ovos_PHAL/version.py +++ b/ovos_PHAL/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 -VERSION_MINOR = 1 -VERSION_BUILD = 1 -VERSION_ALPHA = 0 -# END_VERSION_BLOCK +VERSION_MINOR = 2 +VERSION_BUILD = 0 +VERSION_ALPHA = 1 +# END_VERSION_BLOCK \ No newline at end of file From 8ee56c524db02c0544215a9097313d007e494c61 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Wed, 11 Sep 2024 18:19:48 +0000 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df11287..9b59398 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## [0.1.1a2](https://github.com/OpenVoiceOS/ovos-PHAL/tree/0.1.1a2) (2024-09-10) +## [0.2.0a1](https://github.com/OpenVoiceOS/ovos-PHAL/tree/0.2.0a1) (2024-09-11) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-PHAL/compare/0.1.0...0.1.1a2) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-PHAL/compare/0.1.1...0.2.0a1) **Merged pull requests:** -- chore:semver\_versioning [\#38](https://github.com/OpenVoiceOS/ovos-PHAL/pull/38) ([JarbasAl](https://github.com/JarbasAl)) +- feat:extras\_requirements [\#40](https://github.com/OpenVoiceOS/ovos-PHAL/pull/40) ([JarbasAl](https://github.com/JarbasAl))