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.

Sign up for GitHub

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 skill code into a directory for easier local installation #140

Draft
wants to merge 3 commits into
base: dev
Choose a base branch
from
Draft

Refactor skill code into a directory for easier local installation #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1351e22
Refactor skill code into a directory for easier local installation
NeonDaniel Apr 2, 2024
9989080
Update skill.json
NeonDaniel Apr 2, 2024
8add90d
Fix invalid change in `setup.py`
NeonDaniel Apr 2, 2024
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
3 changes: 2 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ json_database~=0.5
neon-utils~=1.2
combo_lock~=0.2
ovos-utils~=0.0, >=0.0.32
ovos-bus-client~=0.0.3
ovos-bus-client~=0.0.3
adapt-parser>=0.5,<2.0
5 changes: 2 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

import setuptools
from setuptools import setup
from os import getenv, path, walk

Expand Down Expand Up @@ -94,8 +94,7 @@ def find_resource_files():
author_email='[email protected]',
long_description=long_description,
long_description_content_type="text/markdown",
package_dir={SKILL_PKG: ""},
packages=[SKILL_PKG, f"{SKILL_PKG}.util"],
packages=setuptools.find_packages(),
package_data={SKILL_PKG: find_resource_files()},
include_package_data=True,
entry_points={"ovos.plugin.skill": PLUGIN_ENTRY_POINT}
Expand Down
1 change: 1 addition & 0 deletions skill.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"systemDeps": false,
"requirements": {
"python": [
"adapt-parser>=0.5,<2.0",
"combo_lock~=0.2",
"json_database~=0.5",
"neon-utils~=1.2",
Expand Down
0 __init__.py → skill_alerts/__init__.py
View file
Open in desktop
File renamed without changes.
0 util/__init__.py → skill_alerts/util/__init__.py
View file
Open in desktop
File renamed without changes.
0 util/alert.py → skill_alerts/util/alert.py
View file
Open in desktop
File renamed without changes.
0 util/alert_manager.py → skill_alerts/util/alert_manager.py
View file
Open in desktop
File renamed without changes.
0 util/parse_utils.py → skill_alerts/util/parse_utils.py
View file
Open in desktop
File renamed without changes.
0 util/ui_models.py → skill_alerts/util/ui_models.py
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion test/test_skill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import lingua_franca
import pytest
import random
import sys
import shutil
import unittest
import datetime as dt
Expand Down
Loading