diff --git a/.github/workflows/conventional-label.yml b/.github/workflows/conventional-label.yml new file mode 100644 index 0000000..9894c1b --- /dev/null +++ b/.github/workflows/conventional-label.yml @@ -0,0 +1,10 @@ +# auto add labels to PRs +on: + pull_request_target: + types: [ opened, edited ] +name: conventional-release-labels +jobs: + label: + runs-on: ubuntu-latest + steps: + - uses: bcoe/conventional-release-labels@v1 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 16c851e..0000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,28 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish to pypi -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Publish to Test PyPI - uses: pypa/gh-action-pypi-publish@master - with: - password: ${{secrets.PYPI_TOKEN}} diff --git a/.github/workflows/publish_build.yml b/.github/workflows/publish_build.yml deleted file mode 100644 index 6f7c8ad..0000000 --- a/.github/workflows/publish_build.yml +++ /dev/null @@ -1,86 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Build Release ..X -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Remove alpha (declare stable) - run: | - VER=$(python setup.py --version) - python scripts/remove_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Declare alpha stable - branch: dev - - name: Push dev -> master - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master - force: true - - name: version - run: echo "::set-output name=version::$(python setup.py --version)" - id: version - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: V${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - body: | - Changes in this Release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false - commitish: dev - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Prepare next Build version - run: echo "::set-output name=version::$(python setup.py --version)" - id: alpha - - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0 - run: | - VER=$(python setup.py --version) - python scripts/bump_build.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Prepare Next Version - branch: dev - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{secrets.PYPI_TOKEN}} - - name: Send message to Matrix bots channel - id: matrix-chat-message - uses: fadenb/matrix-chat-message@v0.0.6 - with: - homeserver: 'matrix.org' - token: ${{ secrets.MATRIX_TOKEN }} - channel: '!WjxEKjjINpyBRPFgxl:krbel.duckdns.org' - message: | - New skill-ovos-fallback-unknown release! ${{ steps.version.outputs.version }} diff --git a/.github/workflows/publish_major.yml b/.github/workflows/publish_major.yml deleted file mode 100644 index 220cdfe..0000000 --- a/.github/workflows/publish_major.yml +++ /dev/null @@ -1,86 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Major Release X.0.0 -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Remove alpha (declare stable) - run: | - VER=$(python setup.py --version) - python scripts/remove_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Declare alpha stable - branch: dev - - name: Push dev -> master - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master - force: true - - name: version - run: echo "::set-output name=version::$(python setup.py --version)" - id: version - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: V${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - body: | - Changes in this Release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false - commitish: master - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Prepare next Major version - run: echo "::set-output name=version::$(python setup.py --version)" - id: alpha - - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0 - run: | - VER=$(python setup.py --version) - python scripts/bump_major.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Prepare Next Version - branch: dev - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{secrets.PYPI_TOKEN}} - - name: Send message to Matrix bots channel - id: matrix-chat-message - uses: fadenb/matrix-chat-message@v0.0.6 - with: - homeserver: 'matrix.org' - token: ${{ secrets.MATRIX_TOKEN }} - channel: '!WjxEKjjINpyBRPFgxl:krbel.duckdns.org' - message: | - New skill-ovos-fallback-unknown release! ${{ steps.version.outputs.version }} diff --git a/.github/workflows/publish_minor.yml b/.github/workflows/publish_minor.yml deleted file mode 100644 index eeadd42..0000000 --- a/.github/workflows/publish_minor.yml +++ /dev/null @@ -1,86 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Minor Release .X.0 -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Remove alpha (declare stable) - run: | - VER=$(python setup.py --version) - python scripts/remove_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Declare alpha stable - branch: dev - - name: Push dev -> master - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master - force: true - - name: version - run: echo "::set-output name=version::$(python setup.py --version)" - id: version - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: V${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - body: | - Changes in this Release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false - commitish: master - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Prepare next Minor version - run: echo "::set-output name=version::$(python setup.py --version)" - id: alpha - - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0 - run: | - VER=$(python setup.py --version) - python scripts/bump_minor.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Prepare Next Version - branch: dev - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{secrets.PYPI_TOKEN}} - - name: Send message to Matrix bots channel - id: matrix-chat-message - uses: fadenb/matrix-chat-message@v0.0.6 - with: - homeserver: 'matrix.org' - token: ${{ secrets.MATRIX_TOKEN }} - channel: '!WjxEKjjINpyBRPFgxl:krbel.duckdns.org' - message: | - New skill-ovos-fallback-unknown release! ${{ steps.version.outputs.version }} diff --git a/.github/workflows/publish_alpha.yml b/.github/workflows/publish_stable.yml similarity index 56% rename from .github/workflows/publish_alpha.yml rename to .github/workflows/publish_stable.yml index 1cd4443..c9393e7 100644 --- a/.github/workflows/publish_alpha.yml +++ b/.github/workflows/publish_stable.yml @@ -1,26 +1,22 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Alpha Build ...aX +name: Stable Release on: push: - branches: - - dev - paths-ignore: - - 'version.py' - - 'test/**' - - 'examples/**' - - '.github/**' - - '.gitignore' - - 'LICENSE' - - 'CHANGELOG.md' - - 'MANIFEST.in' - - 'readme.md' - - 'scripts/**' - - 'translations/**' + branches: [master] workflow_dispatch: jobs: - build_and_publish: + publish_stable: + uses: TigreGotico/gh-automations/.github/workflows/publish-stable.yml@master + secrets: inherit + with: + branch: 'master' + version_file: 'version.py' + setup_py: 'setup.py' + publish_release: true + + publish_pypi: + needs: publish_stable + if: success() # Ensure this job only runs if the previous job succeeds runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -34,21 +30,6 @@ jobs: - name: Install Build Tools run: | python -m pip install build wheel - - name: Increment Version - run: | - VER=$(python setup.py --version) - python scripts/bump_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - maxIssues: 50 - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Increment Version - branch: dev - name: version run: echo "::set-output name=version::$(python setup.py --version)" id: version @@ -68,8 +49,24 @@ jobs: commitish: dev - name: Build Distribution Packages run: | - python setup.py bdist_wheel - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 + python setup.py sdist bdist_wheel + - name: Publish to Test PyPI + uses: pypa/gh-action-pypi-publish@master with: password: ${{secrets.PYPI_TOKEN}} + + + sync_dev: + needs: publish_stable + if: success() # Ensure this job only runs if the previous job succeeds + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. + ref: master + - name: Push master -> dev + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: dev \ No newline at end of file diff --git a/.github/workflows/release_workflow.yml b/.github/workflows/release_workflow.yml new file mode 100644 index 0000000..d17f77f --- /dev/null +++ b/.github/workflows/release_workflow.yml @@ -0,0 +1,108 @@ +name: Release Alpha and Propose Stable + +on: + pull_request: + types: [closed] + branches: [dev] + +jobs: + publish_alpha: + if: github.event.pull_request.merged == true + uses: TigreGotico/gh-automations/.github/workflows/publish-alpha.yml@master + secrets: inherit + with: + branch: 'dev' + version_file: 'version.py' + setup_py: 'setup.py' + update_changelog: true + publish_prerelease: true + changelog_max_issues: 100 + + notify: + if: github.event.pull_request.merged == true + needs: publish_alpha + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Send message to Matrix bots channel + id: matrix-chat-message + uses: fadenb/matrix-chat-message@v0.0.6 + with: + homeserver: 'matrix.org' + token: ${{ secrets.MATRIX_TOKEN }} + channel: '!WjxEKjjINpyBRPFgxl:krbel.duckdns.org' + message: | + new ${{ github.event.repository.name }} PR merged! https://github.com/${{ github.repository }}/pull/${{ github.event.number }} + + publish_pypi: + needs: publish_alpha + if: success() # Ensure this job only runs if the previous job succeeds + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: dev + fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. + - name: Setup Python + uses: actions/setup-python@v1 + with: + python-version: 3.8 + - name: Install Build Tools + run: | + python -m pip install build wheel + - name: version + run: echo "::set-output name=version::$(python setup.py --version)" + id: version + - name: Build Distribution Packages + run: | + python setup.py sdist bdist_wheel + - name: Publish to Test PyPI + uses: pypa/gh-action-pypi-publish@master + with: + password: ${{secrets.PYPI_TOKEN}} + + + propose_release: + needs: publish_alpha + if: success() # Ensure this job only runs if the previous job succeeds + runs-on: ubuntu-latest + steps: + - name: Checkout dev branch + uses: actions/checkout@v3 + with: + ref: dev + + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: '3.10' + + - name: Get version from setup.py + id: get_version + run: | + VERSION=$(python setup.py --version) + echo "VERSION=$VERSION" >> $GITHUB_ENV + + - name: Create and push new branch + run: | + git checkout -b release-${{ env.VERSION }} + git push origin release-${{ env.VERSION }} + + - name: Open Pull Request from dev to master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + # Variables + BRANCH_NAME="release-${{ env.VERSION }}" + BASE_BRANCH="master" + HEAD_BRANCH="release-${{ env.VERSION }}" + PR_TITLE="Release ${{ env.VERSION }}" + PR_BODY="Human review requested!" + + # Create a PR using GitHub API + curl -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: token $GITHUB_TOKEN" \ + -d "{\"title\":\"$PR_TITLE\",\"body\":\"$PR_BODY\",\"head\":\"$HEAD_BRANCH\",\"base\":\"$BASE_BRANCH\"}" \ + https://api.github.com/repos/${{ github.repository }}/pulls + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9595be5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +dev.env +.dev_opts.json +.idea +*.code-workspace +*.pyc +*.swp +*~ +*.egg-info/ +build +dist +.coverage +/htmlcov +.installed +.mypy_cache +.vscode +.theia +.venv/ + +# Created by unit tests +.pytest_cache/ diff --git a/build/lib/ovos_skill_iss_location/LICENSE b/build/lib/ovos_skill_iss_location/LICENSE deleted file mode 100644 index 617e3cd..0000000 --- a/build/lib/ovos_skill_iss_location/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2024 Casimiro Ferreira - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/build/lib/ovos_skill_iss_location/README.md b/build/lib/ovos_skill_iss_location/README.md deleted file mode 100644 index 80ebb0a..0000000 --- a/build/lib/ovos_skill_iss_location/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# ISS Tracker - - -## About - -Track the location of the ISS - -![](./gui.png) -![](./gui2.png) -![](./gui3.png) - -Can be used as idle screen in a mark2 - -## Examples -* "Where is the ISS" -* "Who is on board of the space station" -* "When is the ISS passing over" -* "Tell me about the ISS" -* "how many persons on board of the space station" - - -## Credits -JarbasAl - -## Category -**Information** - -## Tags -#nasa diff --git a/build/lib/ovos_skill_iss_location/__init__.py b/build/lib/ovos_skill_iss_location/__init__.py deleted file mode 100644 index c1d91b5..0000000 --- a/build/lib/ovos_skill_iss_location/__init__.py +++ /dev/null @@ -1,361 +0,0 @@ -import tempfile -from datetime import datetime, timedelta -from os.path import join -from time import sleep - -import matplotlib.pyplot as plt -import pytz -import requests -from lingua_franca.format import nice_duration -from matplotlib.offsetbox import OffsetImage, AnnotationBbox -from mpl_toolkits.basemap import Basemap -from ovos_utils.time import to_local, now_local -from ovos_workshop.decorators import intent_handler -from ovos_workshop.decorators import resting_screen_handler -from ovos_workshop.intents import IntentBuilder -from ovos_workshop.skills import OVOSSkill -from skyfield.api import Topos, load - - -class ISSLocationSkill(OVOSSkill): - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - if "geonames_user" not in self.settings: - self.settings["geonames_user"] = "jarbas" - if "map_style" not in self.settings: - self.settings["map_style"] = "ortho" - if "center_iss" not in self.settings: - self.settings["center_iss"] = True - if "center_location" not in self.settings: - self.settings["center_location"] = False - if "iss_size" not in self.settings: - self.settings["iss_size"] = 0.5 - if "iss_icon" not in self.settings: - self.settings["iss_icon"] = f"{self.root_dir}/ui/iss3.png" - if "iss_bg" not in self.settings: - self.settings["iss_bg"] = f"{self.root_dir}/ui/iss.png" - if "dpi" not in self.settings: - self.settings["dpi"] = 500 - - def update_picture(self): - try: - data = requests.get("http://api.open-notify.org/iss-now.json").json() - astronauts = requests.get("http://api.open-notify.org/astros.json").json() - - lat = data['iss_position']['latitude'] - lon = data['iss_position']['longitude'] - - params = { - "username": self.settings["geonames_user"], - "lat": lat, - "lng": lon - } - ocean_names = "http://api.geonames.org/oceanJSON" - land_names = "http://api.geonames.org/countryCodeJSON" - - # reverse geo - data = requests.get(ocean_names, params=params).json() - try: - toponym = "The " + data['ocean']['name'] - except: - - try: - params = { - "username": self.settings["geonames_user"], - "lat": lat, - "lng": lon, - "formatted": True, - "style": "full" - } - data = requests.get(land_names, - params=params).json() - toponym = data['countryName'] - except: - toponym = "unknown" - if not self.lang.lower().startswith("en") and toponym != "unknown": - toponym = self.translator.translate(toponym, self.lang) - - image = self.generate_map(lat, lon) - - self.gui['imgLink'] = image - self.gui['caption'] = f"{toponym} Lat: {lat} Lon: {lon}" - self.gui['lat'] = lat - self.gui['lon'] = lon - self.gui['toponym'] = toponym - self.gui["astronauts"] = astronauts["people"] - self.set_context("iss") - except Exception as e: - self.log.exception(e) - - @resting_screen_handler("ISS") - def idle(self, message): - self.update_picture() # values available in self.gui - self.gui.show_image(self.gui['imgLink'], fill='PreserveAspectFit') - - def generate_map(self, lat, lon): - lat = float(lat) - lon = float(lon) - output = join(tempfile.gettempdir(), "iss.jpg") - lat_0 = None - lon_0 = None - if self.settings["center_iss"]: - lat_0 = lat - lon_0 = lon - elif self.settings["center_location"]: - lat_0 = self.location["coordinate"]["latitude"] - lon_0 = self.location["coordinate"]["longitude"] - if self.settings["map_style"] == "cyl": - lat_0 = None - lon_0 = None - m = Basemap(projection=self.settings["map_style"], - resolution=None, - lat_0=lat_0, - lon_0=lon_0) - m.bluemarble() - x, y = m(lon, lat) - - iss = plt.imread(self.settings["iss_icon"]) - im = OffsetImage(iss, zoom=self.settings["iss_size"]) - ab = AnnotationBbox(im, (x, y), xycoords='data', frameon=False) - - # Get the axes object from the basemap and add the AnnotationBbox artist - m._check_ax().add_artist(ab) - - plt.savefig(output, - dpi=self.settings["dpi"], - bbox_inches='tight', - facecolor="black") - plt.close() - return output - - @intent_handler("about.intent") - def handle_about_iss_intent(self, message): - utterance = self.dialog_renderer.render("about", {}) - self.gui.show_image(self.settings["iss_bg"], - override_idle=True, - fill='PreserveAspectFit', - caption=utterance) - self.speak(utterance, wait=True) - sleep(1) - self.gui.clear() - - @intent_handler('where_iss.intent') - def handle_iss(self, message): - self.update_picture() # values available in self.gui - self.gui.show_image(self.gui['imgLink'], - caption=self.gui['caption'], - fill='PreserveAspectFit') - if self.gui['toponym'] == "unknown": - self.speak_dialog("location.unknown", { - "latitude": self.gui['lat'], - "longitude": self.gui['lon'] - }, wait=True) - else: - self.speak_dialog("location.current", { - "latitude": self.gui['lat'], - "longitude": self.gui['lon'], - "toponym": self.gui['toponym'] - }, wait=True) - sleep(1) - self.gui.release() - - @intent_handler('when_iss.intent') - def handle_when(self, message): - lat = self.location["coordinate"]["latitude"] - lon = self.location["coordinate"]["longitude"] - - pred = SatellitePredictions(lat, lon, altitude=0, days=1).predict() - dt = pred["rise"]["time"] # in user timezone - delta = pred["length"] - dur = dt - now_local() - - duration = nice_duration(dur, lang=self.lang) - visible_dur = nice_duration(delta, lang=self.lang) - caption = self.location_pretty + " " + dt.strftime("%m/%d/%Y, %H:%M:%S") - image = self.generate_map(lat, lon) - - self.gui.show_image(image, caption=caption, fill='PreserveAspectFit') - - self.speak_dialog("location.when", { - "duration": duration, - "toponym": self.location_pretty - }, wait=True) - self.speak_dialog("visible_for", { - "duration": visible_dur - }, wait=True) - self.gui.release() - - @intent_handler( - IntentBuilder("WhoISSIntent").require("who").require( - "onboard").require("iss")) - def handle_who(self, message): - self.update_picture() # values available in self.gui - people = [ - p["name"] for p in self.gui["astronauts"] - if p["craft"] == "ISS" - ] - people = ", ".join(people) - self.gui.show_image(self.settings["iss_bg"], - override_idle=True, - fill='PreserveAspectFit', - caption=people) - self.speak_dialog("who", {"people": people}, wait=True) - sleep(1) - self.gui.release() - - @intent_handler( - IntentBuilder("NumberISSIntent").require("how_many").require( - "onboard").require("iss")) - def handle_number(self, message): - self.update_picture() # values available in self.gui - people = [ - p["name"] for p in self.gui["astronauts"] - if p["craft"] == "ISS" - ] - num = len(people) - people = ", ".join(people) - self.gui.show_image(self.settings["iss_bg"], - override_idle=True, - fill='PreserveAspectFit', - caption=people) - self.speak_dialog("number", {"number": num}, wait=True) - sleep(1) - self.gui.release() - - -class SatellitePredictions: - # taken from https://github.com/yuvadm/iss.guru/blob/master/iss/predictions.py - ISS = "ISS (ZARYA)" - STATIONS_URL = "http://celestrak.com/NORAD/elements/stations.txt" - - def __init__(self, lat, lon, altitude=0, tz="UTC", satellite=ISS, start=None, days=10): - self.lat = lat - self.lon = lon - self.altitude = altitude - self.tz = tz - self.start = start - self.days = days - - satellites = load.tle_file(self.STATIONS_URL) - self.satellite = {sat.name: sat for sat in satellites}[satellite] - self.location = Topos(latitude_degrees=self.lat, longitude_degrees=self.lon) - - @staticmethod - def to_local_time(utc_iso: str): - """ensure datetime object is in user timezone""" - naive_datetime = datetime.strptime(utc_iso, '%Y-%m-%dT%H:%M:%SZ') - utc_timezone = pytz.timezone('UTC') - dt = utc_timezone.localize(naive_datetime) - return to_local(dt) - - @staticmethod - def chunks(l, n): - for i in range(0, len(l), n): - yield l[i: i + n] - - @staticmethod - def deg_to_cardinal(deg): - cardinals = [ - "N", - "NNE", - "NE", - "ENE", - "E", - "ESE", - "SE", - "SSE", - "S", - "SSW", - "SW", - "WSW", - "W", - "WNW", - "NW", - "NNW", - ] - return cardinals[round((deg % 360) / 22.5) % 16] - - @staticmethod - def seconds_to_minutes(secs): - return f"{secs // 60}:{secs % 60:02}" - - def get_next_days(self): - ts = load.timescale() - t0 = ts.now() if not self.start else ts.ut1_jd(self.start) - t1 = ts.ut1_jd(t0.ut1 + self.days) - return t0, t1 - - def get_position_details(self, t): - difference = self.satellite - self.location - topocentric = difference.at(t) - alt, az, distance = topocentric.altaz() - azimuth = int(az.degrees) - return { - "time": self.to_local_time(t.utc_iso()), - "degrees": int(alt.degrees), - "azimuth": azimuth, - "direction": self.deg_to_cardinal(azimuth), - "distance": int(distance.km), - } - - def get_prediction_events(self): - t0, t1 = self.get_next_days() - - ts, _events = self.satellite.find_events( - self.location, t0, t1, altitude_degrees=self.altitude - ) - - # events are returned as 3-tuples of (rise, culminate, set) - # where rise/set are relative to given altitude - # docs mention the possibility of several culminations - # https://rhodesmill.org/skyfield/earth-satellites.html#finding-when-a-satellite-rises-and-sets - # but this doesn't seem to happen in our case - res = list(self.chunks(ts, 3)) - - if len(res[-1]) != 3: - # truncate the last event in case it's a partial one - res = res[:-1] - - return res - - def predict(self): - preds = self.get_prediction_events() - rise, culminate, zet = preds[0] - length = int((zet - rise) * 86400) - return { - "length": timedelta(seconds=length), - "length_mins": self.seconds_to_minutes(length), - "rise": self.get_position_details(rise), - "culminate": self.get_position_details(culminate), - "set": self.get_position_details(zet), - } - - -if __name__ == "__main__": - from ovos_utils.fakebus import FakeBus - from ovos_bus_client.message import Message - from ovos_config.locale import setup_locale - setup_locale() - - - # print speak for debugging - def spk(utt, *args, **kwargs): - print(utt) - - - s = ISSLocationSkill(skill_id="fake.test", bus=FakeBus()) - # s.update_picture() - s.speak = spk - - s.handle_number(Message("")) - # there are 7 persons on board of the international space station - s.handle_who(Message("")) - # Jasmin Moghbeli, Andreas Mogensen, Satoshi Furukawa, Konstantin Borisov, Oleg Kononenko, Nikolai Chub, Loral O'Hara are in orbit on board of the space station - s.handle_iss(Message("")) - # The international space station is now over Central African Republic at 8.6270 latitude 21.5912 longitude - s.handle_when(Message("")) - # The I S S will be over XXX in seven minutes twenty five seconds - # It will be visible during seven minutes twenty five seconds - s.handle_about_iss_intent(Message("")) - # The International Space Station is a modular space station in low Earth orbit. The ISS programme is a multi-national collaborative project between five participating space agencies: NASA ( United States ) , Roscosmos ( Russia ) , JAXA ( Japan ) , ESA ( Europe ) , and CSA ( Canada ) .The ownership and use of the space station is established by intergovernmental treaties and agreements. diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/about.dialog b/build/lib/ovos_skill_iss_location/locale/en-us/about.dialog deleted file mode 100644 index 5bc9286..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/about.dialog +++ /dev/null @@ -1 +0,0 @@ -The International Space Station is a modular space station in low Earth orbit. The ISS programme is a multi-national collaborative project between five participating space agencies: NASA (United States), Roscosmos (Russia), JAXA (Japan), ESA (Europe), and CSA (Canada).The ownership and use of the space station is established by intergovernmental treaties and agreements. \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/about.intent b/build/lib/ovos_skill_iss_location/locale/en-us/about.intent deleted file mode 100644 index 76fd7f9..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/about.intent +++ /dev/null @@ -1 +0,0 @@ -(talk about|tell me about|what is|info about) the (international|) space station \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/how_many.voc b/build/lib/ovos_skill_iss_location/locale/en-us/how_many.voc deleted file mode 100644 index f8c1995..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/how_many.voc +++ /dev/null @@ -1,3 +0,0 @@ -how many -number -total \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/iss.voc b/build/lib/ovos_skill_iss_location/locale/en-us/iss.voc deleted file mode 100644 index bc442a6..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/iss.voc +++ /dev/null @@ -1,4 +0,0 @@ -I S S -ISS -international space station -space station \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/location.current.dialog b/build/lib/ovos_skill_iss_location/locale/en-us/location.current.dialog deleted file mode 100644 index 2d44c9e..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/location.current.dialog +++ /dev/null @@ -1,5 +0,0 @@ -It's at {latitude} latitude {longitude} longitude, over {toponym} -Over {toponym} at {latitude} latitude and {longitude} longitude -The I S S is over {latitude} latitude {longitude} longitude which corresponds to {toponym} -The international space station is now over {toponym} at {latitude} latitude {longitude} longitude -The space station is at {latitude} latitude {longitude} longitude over {toponym} \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/location.unknown.dialog b/build/lib/ovos_skill_iss_location/locale/en-us/location.unknown.dialog deleted file mode 100644 index f36eeac..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/location.unknown.dialog +++ /dev/null @@ -1,2 +0,0 @@ -The ISS is now over {latitude} latitude {longitude} longitude but there is no associated geographic feature -The space station is at {latitude} latitude {longitude} longitude but I don't know where this is \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/location.when.dialog b/build/lib/ovos_skill_iss_location/locale/en-us/location.when.dialog deleted file mode 100644 index e6b5333..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/location.when.dialog +++ /dev/null @@ -1,3 +0,0 @@ -The I S S will be over {toponym} in {duration} -The international space station will be at {toponym} in {duration} -The space station will be at {toponym} in {duration} \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/number.dialog b/build/lib/ovos_skill_iss_location/locale/en-us/number.dialog deleted file mode 100644 index c352909..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/number.dialog +++ /dev/null @@ -1,8 +0,0 @@ -there are {number} persons in orbit on board of the space station -there are {number} persons on board of the I S S -there are {number} persons on board of the international space station -there are {number} persons on board of the space station -{number} persons are in orbit on board of the space station -{number} persons are on board of the I S S -{number} persons are on board of the international space station -{number} persons are on board of the space station \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/onboard.voc b/build/lib/ovos_skill_iss_location/locale/en-us/onboard.voc deleted file mode 100644 index c4dbbed..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/onboard.voc +++ /dev/null @@ -1,4 +0,0 @@ -aboard -on board -on the -staying \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/visible_for.dialog b/build/lib/ovos_skill_iss_location/locale/en-us/visible_for.dialog deleted file mode 100644 index b446a7f..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/visible_for.dialog +++ /dev/null @@ -1,2 +0,0 @@ -It will be visible for {duration} -You will be able to see it for {duration} \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/when_iss.intent b/build/lib/ovos_skill_iss_location/locale/en-us/when_iss.intent deleted file mode 100644 index 97be7ce..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/when_iss.intent +++ /dev/null @@ -1,4 +0,0 @@ -when is the (international|) space station passing (by|over|above) (us|me|) -when is the (ISS|I S S) passing (by|over|above) (us|me|) -when is the (international|) space station going to be (over|above) (us|me|) -when is the (ISS|I S S) going to be (over|above) (us|me|) diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/where_iss.intent b/build/lib/ovos_skill_iss_location/locale/en-us/where_iss.intent deleted file mode 100644 index abd576a..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/where_iss.intent +++ /dev/null @@ -1,6 +0,0 @@ -where is the (international|) space station -(what is|tell me) the (international|) space station location -location of the (international|) space station -where is the (ISS|I S S) -(what is|tell me) the (ISS|I S S) location -location of the (ISS|I S S) diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/who.dialog b/build/lib/ovos_skill_iss_location/locale/en-us/who.dialog deleted file mode 100644 index e11f2f2..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/who.dialog +++ /dev/null @@ -1,6 +0,0 @@ -the following people are on board of the international space station, {people} -the following persons are on board of the international space station, {people} -{people} are in orbit on board of the space station -{people} are on board of the I S S -{people} are on board of the international space station -{people} are on board of the space station \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/en-us/who.voc b/build/lib/ovos_skill_iss_location/locale/en-us/who.voc deleted file mode 100644 index ec59349..0000000 --- a/build/lib/ovos_skill_iss_location/locale/en-us/who.voc +++ /dev/null @@ -1,4 +0,0 @@ -people -person -persons -who \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/about.dialog b/build/lib/ovos_skill_iss_location/locale/pt-pt/about.dialog deleted file mode 100644 index ee8f333..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/about.dialog +++ /dev/null @@ -1 +0,0 @@ -A Estação Espacial Internacional é uma estação espacial modular em órbita baixa da Terra. O programa ISS é um projeto colaborativo multinacional entre cinco agências espaciais participantes: NASA (Estados Unidos), Roscosmos (Rússia), JAXA (Japão), ESA (Europa) e CSA (Canadá). A estação é estabelecida por tratados e acordos intergovernamentais. \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/about.intent b/build/lib/ovos_skill_iss_location/locale/pt-pt/about.intent deleted file mode 100644 index ba4a929..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/about.intent +++ /dev/null @@ -1,4 +0,0 @@ -(fala|diz-me|conta-me|) sobre a ISS -(fala|diz-me|conta-me|) sobre a estação espacial (internacional|) -(fale|diga-me|conte-me|) sobre a estação espacial (internacional|) -o que é (a|) ISS \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/how_many.voc b/build/lib/ovos_skill_iss_location/locale/pt-pt/how_many.voc deleted file mode 100644 index bd1cc77..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/how_many.voc +++ /dev/null @@ -1,3 +0,0 @@ -número -quantas -total \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/iss.voc b/build/lib/ovos_skill_iss_location/locale/pt-pt/iss.voc deleted file mode 100644 index b34ab25..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/iss.voc +++ /dev/null @@ -1,4 +0,0 @@ -I S S -ISS -estação Espacial -estação Espacial Internacional \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/location.current.dialog b/build/lib/ovos_skill_iss_location/locale/pt-pt/location.current.dialog deleted file mode 100644 index f21bdc1..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/location.current.dialog +++ /dev/null @@ -1,5 +0,0 @@ -A I S S está acima de {latitude} latitude {longitude} longitude que corresponde a {toponym} -A estação espacial está em {latitude} latitude {longitude} longitude sobre {toponym} -A estação espacial internacional está agora sobre {toponym} em {latitude} latitude {longitude} longitude -Fica a {latitude} latitude {longitude} longitude, sobre {toponym} -Sobre {toponym} em {latitude} latitude e {longitude} longitude \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/location.unknown.dialog b/build/lib/ovos_skill_iss_location/locale/pt-pt/location.unknown.dialog deleted file mode 100644 index 248343e..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/location.unknown.dialog +++ /dev/null @@ -1,2 +0,0 @@ -A ISS está agora acima de {latitude} latitude {longitude} longitude, mas não há nenhuma característica geográfica associada -A estação espacial está em {latitude} latitude {longitude} longitude, mas não sei onde isso fica \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/location.when.dialog b/build/lib/ovos_skill_iss_location/locale/pt-pt/location.when.dialog deleted file mode 100644 index 4b0be5d..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/location.when.dialog +++ /dev/null @@ -1,3 +0,0 @@ -A I S S vai estar em {toponym} dentro de {duration} -A estação espacial estará em {toponym} em {duration} -A estação espacial internacional estará em {toponym} em {duration} \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/number.dialog b/build/lib/ovos_skill_iss_location/locale/pt-pt/number.dialog deleted file mode 100644 index 417a9fd..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/number.dialog +++ /dev/null @@ -1,8 +0,0 @@ -há {number} pessoas a bordo da I S S -há {number} pessoas a bordo da estação espacial -há {number} pessoas a bordo da estação espacial internacional -há {number} pessoas em órbita a bordo da estação espacial -{number} pessoas estão a bordo da I S S -{number} pessoas estão a bordo da estação espacial -{number} pessoas estão a bordo da estação espacial internacional -{number} pessoas estão em órbita a bordo da estação espacial \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/onboard.voc b/build/lib/ovos_skill_iss_location/locale/pt-pt/onboard.voc deleted file mode 100644 index 1d7ecdc..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/onboard.voc +++ /dev/null @@ -1,3 +0,0 @@ -(da|na) -a bordo -a ficar \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/when_iss.intent b/build/lib/ovos_skill_iss_location/locale/pt-pt/when_iss.intent deleted file mode 100644 index a45ae8f..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/when_iss.intent +++ /dev/null @@ -1,4 +0,0 @@ -a estação espacial internacional passa quando -quando vai passar a estação espacial internacional -quando vai passar a I S S -quando vai passar a estação espacial \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/where_iss.intent b/build/lib/ovos_skill_iss_location/locale/pt-pt/where_iss.intent deleted file mode 100644 index 1b432f8..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/where_iss.intent +++ /dev/null @@ -1,7 +0,0 @@ -Localização I S S -localização da I S S -localização da estação espacial -localização da estação espacial internacional -onde (está|anda) a estação espacial internacional -onde anda a estação espacial -onde está a I S S \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/who.dialog b/build/lib/ovos_skill_iss_location/locale/pt-pt/who.dialog deleted file mode 100644 index 4dce445..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/who.dialog +++ /dev/null @@ -1,5 +0,0 @@ -as seguintes pessoas estão a bordo da estação espacial internacional, {people} -{people} estão a bordo da I S S -{people} estão a bordo da estação espacial internacional -{people} estão em órbita a bordo da estação espacial -{people} estão na estação espacial \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/locale/pt-pt/who.voc b/build/lib/ovos_skill_iss_location/locale/pt-pt/who.voc deleted file mode 100644 index 65c9e0e..0000000 --- a/build/lib/ovos_skill_iss_location/locale/pt-pt/who.voc +++ /dev/null @@ -1,3 +0,0 @@ -Quem -pessoa -pessoas \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/PKG-INFO b/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/PKG-INFO deleted file mode 100644 index 33ffa5a..0000000 --- a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/PKG-INFO +++ /dev/null @@ -1,11 +0,0 @@ -Metadata-Version: 1.0 -Name: ovos-skill-iss-location -Version: 0.1.0 -Summary: info about where is the space station and astronauts on board -Home-page: https://github.com/OpenVoiceOS/ovos-skill-iss-location -Author: OpenVoiceOS -Author-email: jarbasai@mailfence.com -License: Apache2.0 -Description: UNKNOWN -Keywords: ovos skill plugin -Platform: UNKNOWN diff --git a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/SOURCES.txt b/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/SOURCES.txt deleted file mode 100644 index 7e774f3..0000000 --- a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/SOURCES.txt +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE -README.md -__init__.py -setup.py -version.py -ovos_skill_iss_location.egg-info/PKG-INFO -ovos_skill_iss_location.egg-info/SOURCES.txt -ovos_skill_iss_location.egg-info/dependency_links.txt -ovos_skill_iss_location.egg-info/entry_points.txt -ovos_skill_iss_location.egg-info/requires.txt -ovos_skill_iss_location.egg-info/top_level.txt \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/dependency_links.txt b/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/entry_points.txt b/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/entry_points.txt deleted file mode 100644 index e5df944..0000000 --- a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/entry_points.txt +++ /dev/null @@ -1,3 +0,0 @@ -[ovos.plugin.skill] -ovos-skill-iss-location.openvoiceos=ovos_skill_iss_location:ISSLocationSkill - diff --git a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/requires.txt b/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/requires.txt deleted file mode 100644 index 1f3976d..0000000 --- a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/requires.txt +++ /dev/null @@ -1,5 +0,0 @@ -matplotlib -basemap -pillow -requests -skyfield diff --git a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/top_level.txt b/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/top_level.txt deleted file mode 100644 index 5c88c0f..0000000 --- a/build/lib/ovos_skill_iss_location/ovos_skill_iss_location.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -ovos_skill_iss_location diff --git a/build/lib/ovos_skill_iss_location/res/desktop/skill-iss-location.desktop b/build/lib/ovos_skill_iss_location/res/desktop/skill-iss-location.desktop deleted file mode 100644 index ddc2ff0..0000000 --- a/build/lib/ovos_skill_iss_location/res/desktop/skill-iss-location.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Terminal=false -Type=Application -Name=ISSTracker -Exec=mycroft-gui-app --hideTextInput --skill=skill-iss-location.jarbasskills.home -Icon=icon.png -Categories=VoiceApp -StartupNotify=false -X-DBUS-StartupType=None -X-KDE-StartupNotify=false \ No newline at end of file diff --git a/build/lib/ovos_skill_iss_location/res/icon/icon.png b/build/lib/ovos_skill_iss_location/res/icon/icon.png deleted file mode 100644 index 621bd04..0000000 Binary files a/build/lib/ovos_skill_iss_location/res/icon/icon.png and /dev/null differ diff --git a/build/lib/ovos_skill_iss_location/ui/iss.png b/build/lib/ovos_skill_iss_location/ui/iss.png deleted file mode 100644 index 4c2868c..0000000 Binary files a/build/lib/ovos_skill_iss_location/ui/iss.png and /dev/null differ diff --git a/build/lib/ovos_skill_iss_location/ui/iss2.png b/build/lib/ovos_skill_iss_location/ui/iss2.png deleted file mode 100644 index 48d7ad7..0000000 Binary files a/build/lib/ovos_skill_iss_location/ui/iss2.png and /dev/null differ diff --git a/build/lib/ovos_skill_iss_location/ui/iss3.png b/build/lib/ovos_skill_iss_location/ui/iss3.png deleted file mode 100644 index db25245..0000000 Binary files a/build/lib/ovos_skill_iss_location/ui/iss3.png and /dev/null differ diff --git a/build/lib/ovos_skill_iss_location/version.py b/build/lib/ovos_skill_iss_location/version.py deleted file mode 100644 index cbb1e3f..0000000 --- a/build/lib/ovos_skill_iss_location/version.py +++ /dev/null @@ -1,6 +0,0 @@ -# START_VERSION_BLOCK -VERSION_MAJOR = 0 -VERSION_MINOR = 1 -VERSION_BUILD = 0 -VERSION_ALPHA = 0 -# END_VERSION_BLOCK diff --git a/dist/ovos_skill_iss_location-0.1.0-py3-none-any.whl b/dist/ovos_skill_iss_location-0.1.0-py3-none-any.whl deleted file mode 100644 index 4f67f7d..0000000 Binary files a/dist/ovos_skill_iss_location-0.1.0-py3-none-any.whl and /dev/null differ diff --git a/ovos_skill_iss_location.egg-info/PKG-INFO b/ovos_skill_iss_location.egg-info/PKG-INFO deleted file mode 100644 index 33ffa5a..0000000 --- a/ovos_skill_iss_location.egg-info/PKG-INFO +++ /dev/null @@ -1,11 +0,0 @@ -Metadata-Version: 1.0 -Name: ovos-skill-iss-location -Version: 0.1.0 -Summary: info about where is the space station and astronauts on board -Home-page: https://github.com/OpenVoiceOS/ovos-skill-iss-location -Author: OpenVoiceOS -Author-email: jarbasai@mailfence.com -License: Apache2.0 -Description: UNKNOWN -Keywords: ovos skill plugin -Platform: UNKNOWN diff --git a/ovos_skill_iss_location.egg-info/SOURCES.txt b/ovos_skill_iss_location.egg-info/SOURCES.txt deleted file mode 100644 index 7e774f3..0000000 --- a/ovos_skill_iss_location.egg-info/SOURCES.txt +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE -README.md -__init__.py -setup.py -version.py -ovos_skill_iss_location.egg-info/PKG-INFO -ovos_skill_iss_location.egg-info/SOURCES.txt -ovos_skill_iss_location.egg-info/dependency_links.txt -ovos_skill_iss_location.egg-info/entry_points.txt -ovos_skill_iss_location.egg-info/requires.txt -ovos_skill_iss_location.egg-info/top_level.txt \ No newline at end of file diff --git a/ovos_skill_iss_location.egg-info/dependency_links.txt b/ovos_skill_iss_location.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/ovos_skill_iss_location.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ovos_skill_iss_location.egg-info/entry_points.txt b/ovos_skill_iss_location.egg-info/entry_points.txt deleted file mode 100644 index e5df944..0000000 --- a/ovos_skill_iss_location.egg-info/entry_points.txt +++ /dev/null @@ -1,3 +0,0 @@ -[ovos.plugin.skill] -ovos-skill-iss-location.openvoiceos=ovos_skill_iss_location:ISSLocationSkill - diff --git a/ovos_skill_iss_location.egg-info/requires.txt b/ovos_skill_iss_location.egg-info/requires.txt deleted file mode 100644 index 1f3976d..0000000 --- a/ovos_skill_iss_location.egg-info/requires.txt +++ /dev/null @@ -1,5 +0,0 @@ -matplotlib -basemap -pillow -requests -skyfield diff --git a/ovos_skill_iss_location.egg-info/top_level.txt b/ovos_skill_iss_location.egg-info/top_level.txt deleted file mode 100644 index 5c88c0f..0000000 --- a/ovos_skill_iss_location.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -ovos_skill_iss_location diff --git a/requirements.txt b/requirements.txt index 49e8bc8..f654bce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,5 @@ matplotlib basemap pillow requests -skyfield \ No newline at end of file +skyfield +ovos_workshop>=0.0.12,<2.0.0 \ No newline at end of file