Skip to content

Commit

Permalink
Merge pull request #1193 from custom-components/dev
Browse files Browse the repository at this point in the history
2021-02-19
  • Loading branch information
alandtse authored Feb 20, 2021
2 parents 91bb038 + 41d309b commit ac65cc4
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 80 deletions.
64 changes: 30 additions & 34 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,43 +29,39 @@ jobs:
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}
# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
4 changes: 2 additions & 2 deletions .github/workflows/semantic_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@ jobs:
- name: Push changes to dev
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: dev
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: dev
41 changes: 33 additions & 8 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,44 @@
---
name: Mark stale issues and pull requests

on:
schedule:
- cron: "30 1 * * *"
- cron: "30 1 * * *"

jobs:
stale:

runs-on: ubuntu-latest

steps:
- uses: actions/stale@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'The issue is stale and will be closed shortly.'
stale-pr-message: 'The PR is stale and will be closed shortly.'
stale-issue-label: 'no-issue-activity'
stale-pr-label: 'no-pr-activity'
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
exempt-issue-labels: 'help-wanted'
exempt-pr-labels: 'help-wanted'
stale-issue-message: 'The issue has received no activity for 60 days and will be closed in a week.'
stale-pr-message: 'The PR has received no activity for 60 days and will be closed in a week.'
stale-issue-label: 'no-issue-activity'
stale-pr-label: 'no-pr-activity'
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 21
days-before-close: -1
only-labels: 'feature'
stale-issue-message: >-
This feature request has been labelled as *help wanted* since
there has been no activity in the last 3 weeks. It will not be
closed automatically.
stale-issue-label: 'help-wanted'
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 21
days-before-close: -1
only-labels: 'bug'
stale-issue-message: >-
This bug report has been labelled as *help wanted* since
there has been no activity in the last 3 weeks. It will not be
closed automatically.
stale-issue-label: 'help-wanted'
33 changes: 0 additions & 33 deletions .github/workflows/test.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
extends: default

rules:
document-start: disable
indentation:
spaces: 2
truthy:
allowed-values: ['true', 'false', 'on']
line-length:
max: 120140
1 change: 1 addition & 0 deletions custom_components/alexa_media/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,7 @@ async def ws_handler(message_obj):
)
elif command in [
"PUSH_DELETE_DOPPLER_ACTIVITIES", # delete Alexa history
"PUSH_LIST_CHANGE", # clear a shopping list https://github.com/custom-components/alexa_media_player/issues/1190
"PUSH_LIST_ITEM_CHANGE", # update shopping list
"PUSH_CONTENT_FOCUS_CHANGE", # likely prime related refocus
"PUSH_DEVICE_SETUP_STATE_CHANGE", # likely device changes mid setup
Expand Down
2 changes: 1 addition & 1 deletion custom_components/alexa_media/alexa_media.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
Alexa Devices Base Class.
# SPDX-License-Identifier: Apache-2.0
SPDX-License-Identifier: Apache-2.0
For more details about this platform, please refer to the documentation at
https://community.home-assistant.io/t/echo-devices-alexa-as-media-player-testers-needed/58639
Expand Down
2 changes: 1 addition & 1 deletion custom_components/alexa_media/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"issue_tracker": "https://github.com/custom-components/alexa_media_player/issues",
"dependencies": ["persistent_notification", "http"],
"codeowners": ["@keatontaylor", "@alandtse"],
"requirements": ["alexapy==1.24.1", "packaging~=20.3", "wrapt~=1.12.1"]
"requirements": ["alexapy==1.24.2", "packaging~=20.3", "wrapt~=1.12.1"]
}
18 changes: 17 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ black = {version = "^20.8b1", allow-prereleases = true}
pytest = "^6.2.2"
homeassistant = "^2021.2.3"
codespell = "^2.0.0"
yamllint = "^1.26.0"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down

0 comments on commit ac65cc4

Please sign in to comment.