Skip to content

Commit 1d8ed65

Browse files
committed
automations
1 parent 03e1024 commit 1d8ed65

File tree

10 files changed

+34
-25
lines changed

10 files changed

+34
-25
lines changed

.github/workflows/license_tests.yml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
name: Run License Tests
22
on:
33
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- dev
49
workflow_dispatch:
510

611
jobs:
712
license_tests:
813
runs-on: ubuntu-latest
914
steps:
1015
- uses: actions/checkout@v2
11-
with:
12-
ref: ${{ github.head_ref }}
1316
- name: Setup Python
1417
uses: actions/setup-python@v1
1518
with:
@@ -24,12 +27,18 @@ jobs:
2427
- name: Install core repo
2528
run: |
2629
pip install .
27-
- name: Install licheck
28-
run: |
29-
pip install git+https://github.com/NeonJarbas/lichecker
30-
- name: Install test dependencies
30+
- name: Get explicit and transitive dependencies
3131
run: |
32-
pip install pytest pytest-timeout pytest-cov
33-
- name: Test Licenses
34-
run: |
35-
pytest test/license_tests.py
32+
pip freeze > requirements-all.txt
33+
- name: Check python
34+
id: license_check_report
35+
uses: pilosus/action-pip-license-checker@v0.5.0
36+
with:
37+
requirements: 'requirements-all.txt'
38+
fail: 'Copyleft,Other,Error'
39+
fails-only: true
40+
exclude: '^(tqdm).*'
41+
exclude-license: '^(Mozilla).*$'
42+
- name: Print report
43+
if: ${{ always() }}
44+
run: echo "${{ steps.license_check_report.outputs.report }}"

.github/workflows/publish_alpha.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches:
88
- dev
99
paths-ignore:
10-
- 'ovos_bus/version.py'
10+
- 'ovos_messagebus/version.py'
1111
- 'test/**'
1212
- 'examples/**'
1313
- '.github/**'

.github/workflows/unit_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches:
55
- dev
66
paths-ignore:
7-
- 'ovos_bus/version.py'
7+
- 'ovos_messagebus/version.py'
88
- 'examples/**'
99
- '.github/**'
1010
- '.gitignore'
@@ -17,7 +17,7 @@ on:
1717
branches:
1818
- master
1919
paths-ignore:
20-
- 'ovos_bus/version.py'
20+
- 'ovos_messagebus/version.py'
2121
- 'requirements/**'
2222
- 'examples/**'
2323
- '.github/**'
@@ -55,7 +55,7 @@ jobs:
5555
pip install -r requirements/tests.txt
5656
- name: Run unittests
5757
run: |
58-
pytest --cov=ovos_bus --cov-report xml test/unittests
58+
pytest --cov=ovos_messagebus --cov-report xml test/unittests
5959
# NOTE: additional pytest invocations should also add the --cov-append flag
6060
# or they will overwrite previous invocations' coverage reports
6161
# (for an example, see OVOS Skill Manager's workflow)

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ghcr.io/openvoiceos/core:dev
22

3-
COPY . /tmp/ovos-bus
4-
RUN pip3 install /tmp/ovos-bus
3+
COPY . /tmp/ovos-messagebus
4+
RUN pip3 install /tmp/ovos-messagebus
55

66
USER mycroft
7-
ENTRYPOINT mycroft-messagebus
7+
ENTRYPOINT ovos-messagebus

scripts/bump_alpha.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from os.path import join, dirname
33

44

5-
version_file = join(dirname(dirname(__file__)), "ovos_bus", "version.py")
5+
version_file = join(dirname(dirname(__file__)), "ovos_messagebus", "version.py")
66
version_var_name = "VERSION_ALPHA"
77

88
with open(version_file, "r", encoding="utf-8") as v:

scripts/bump_build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from os.path import join, dirname
33

44

5-
version_file = join(dirname(dirname(__file__)), "ovos_bus", "version.py")
5+
version_file = join(dirname(dirname(__file__)), "ovos_messagebus", "version.py")
66
version_var_name = "VERSION_BUILD"
77
alpha_var_name = "VERSION_ALPHA"
88

scripts/bump_major.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from os.path import join, dirname
33

44

5-
version_file = join(dirname(dirname(__file__)), "ovos_bus", "version.py")
5+
version_file = join(dirname(dirname(__file__)), "ovos_messagebus", "version.py")
66
version_var_name = "VERSION_MAJOR"
77
minor_var_name = "VERSION_MINOR"
88
build_var_name = "VERSION_BUILD"

scripts/bump_minor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from os.path import join, dirname
33

44

5-
version_file = join(dirname(dirname(__file__)), "ovos_bus", "version.py")
5+
version_file = join(dirname(dirname(__file__)), "ovos_messagebus", "version.py")
66
version_var_name = "VERSION_MINOR"
77
build_var_name = "VERSION_BUILD"
88
alpha_var_name = "VERSION_ALPHA"

scripts/remove_alpha.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from os.path import join, dirname
33

44

5-
version_file = join(dirname(dirname(__file__)), "ovos_bus", "version.py")
5+
version_file = join(dirname(dirname(__file__)), "ovos_messagebus", "version.py")
66

77
alpha_var_name = "VERSION_ALPHA"
88

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def required(requirements_file):
3535
def get_version():
3636
""" Find the version of ovos-core"""
3737
version = None
38-
version_file = os.path.join(BASEDIR, 'ovos_bus', 'version.py')
38+
version_file = os.path.join(BASEDIR, 'ovos_messagebus', 'version.py')
3939
major, minor, build, alpha = (None, None, None, None)
4040
with open(version_file) as f:
4141
for line in f:
@@ -58,10 +58,10 @@ def get_version():
5858

5959

6060
setup(
61-
name='ovos-bus',
61+
name='ovos-messagebus',
6262
version=get_version(),
6363
license='Apache-2.0',
64-
url='https://github.com/OpenVoiceOS/ovos-bus',
64+
url='https://github.com/OpenVoiceOS/ovos-messagebus',
6565
description='ovos-core reference python bus daemon',
6666
include_package_data=True,
6767
install_requires=required('requirements.txt'),

0 commit comments

Comments
 (0)