Skip to content

Commit

Permalink
Merge branch 'release/v1.3.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Limych committed Sep 13, 2020
2 parents a2e39a4 + 18a5b29 commit 2b67f39
Show file tree
Hide file tree
Showing 17 changed files with 147 additions and 292 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/semantic_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
name: semantic_release

on:
push:
branches:
- master

jobs:
deploy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
with:
ref: master
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install python-semantic-release
- name: Setup Git
run: |
git config --global user.name "semantic-release"
git config --global user.email "semantic-release@GitHub"
- name: Publish with semantic-release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
DEBUG='*' semantic-release publish
# Pack the ha-iaquk dir as a zip and upload to the release
- name: Zip iaquk dir
run: |
cd /home/runner/work/ha-iaquk/ha-iaquk/custom_components/iaquk
zip iaquk.zip -r ./
- name: Set release variable
run: |
echo "::set-env name=release_version::`git describe --abbrev=0`"
- name: Sleep
# add delay so upload does not kill the release notes from semantic-release
run: |
sleep 5
- name: Upload zip to release
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: /home/runner/work/ha-iaquk/ha-iaquk/custom_components/iaquk/iaquk.zip
asset_name: iaquk.zip
tag: ${{ env.release_version }}
overwrite: true
76 changes: 2 additions & 74 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ venv/
ENV/
env.bak/
venv.bak/
/.idea/

# Spyder project settings
.spyderproject
Expand All @@ -105,79 +106,6 @@ venv.bak/



# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser



dev-config
/custom_components/__init__.py
/test*.py
11 changes: 0 additions & 11 deletions .idea/ha-iaquk.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ repos:
- id: no-commit-to-branch
args:
- --branch=master
- repo: https://github.com/adrienverge/yamllint.git
rev: v1.23.0
hooks:
- id: yamllint
- repo: local
hooks:
# Run mypy through our wrapper script in order to get the possible
Expand All @@ -47,10 +43,6 @@ repos:
types: [python]
require_serial: true
files: ^custom_components/.+\.py$
- id: update-tracker
name: "Update Tracker"
entry: script/update_tracker.py
language: system
- id: pylint
name: pylint
entry: python3 -m pylint.__main__
Expand Down
13 changes: 1 addition & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,18 +166,7 @@ If you want to contribute to this please read the [Contribution guidelines](CONT

## Track updates

You can automatically track new versions of this component and update it by [custom-updater](https://github.com/custom-components/custom_updater) (deprecated) or [HACS][hacs].

For custom-updater to initiate tracking add this lines to you `configuration.yaml` file:

```yaml
# Example configuration.yaml entry
custom_updater:
track:
- components
component_urls:
- https://raw.githubusercontent.com/Limych/ha-iaquk/master/tracker.json
```
You can automatically track new versions of this component and update it by [HACS][hacs].

## License

Expand Down
2 changes: 1 addition & 1 deletion custom_components/iaquk/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Base component constants
DOMAIN = "iaquk"
VERSION = '1.3.2'
VERSION = '1.3.3'
ISSUE_URL = "https://github.com/Limych/ha-iaquk/issues"
ATTRIBUTION = None

Expand Down
7 changes: 7 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
-r requirements.txt
black
flake8
mypy
pre-commit
pylint
pylint-strict-informational
pyupgrade
yamllint
2 changes: 1 addition & 1 deletion script/dev-deploy
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ die() {



ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." >/dev/null 2>&1 && pwd )"
ROOT="$( cd "$( dirname "$(readlink -f "$0")" )/.." >/dev/null 2>&1 && pwd )"

HASSIO_CONFIG="${ROOT}/dev-config"

Expand Down
3 changes: 3 additions & 0 deletions script/setup
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ cd "${ROOT}"
script/bootstrap

pre-commit install
pip3 install -r requirements-dev.txt

touch custom_components/__init__.py

CONFIG=/run/user/$(id -u)/gvfs/smb-share:server=hassio,share=config/
if [ -d "$CONFIG" ] && [ ! -e dev-config ]; then
Expand Down
102 changes: 0 additions & 102 deletions script/update_tracker.py

This file was deleted.

Loading

0 comments on commit 2b67f39

Please sign in to comment.