Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-plugins-1.6'
Browse files Browse the repository at this point in the history
* origin/release-plugins-1.6: (705 commits)
  Removed rpi1wire from release (to be converted to SmartPlugin first)
  setting release version number
  setting develop branch to "after release"
  Implemented independent version number for plugin repo
  Added plugin-release version to __init__.py of directory /plugins
  some more windows compat for backend
  fixed expire value
  visu_websocket: bugfix; knx: Added description to metadata
  knx: version adjusted
  removed ]
  Added new definition for visu_acl for logics that works in editor. However the functionality is currently commented out for logics (since ~1.5 years)
  make struct items instance compatible
  knx: Added handling if multiple GAs are specified for knx_init (analog to knx_cache)
  knx: Added handling if multiple GAs are specified for knx_cache
  added way to make sub threads in python telegram bot more readable
  mqtt: Bugfix
  update plugin yaml
  shng min version 1.6
  fixed problems with dependency init
  darksky: Additions to documentation
  ...
  • Loading branch information
msinn committed May 11, 2019
2 parents 248c606 + 16420ef commit fe5c3ea
Show file tree
Hide file tree
Showing 1,410 changed files with 46,044 additions and 240,905 deletions.
2 changes: 1 addition & 1 deletion .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ echo "travis_fold:end:Links"
echo -e "travis_fold:start:Suite\nRunning suite"

cd smarthome
tox
tox || exit 1
cd ..

echo "travis_fold:end:Suite"
Expand Down
15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
sudo: false
language: python
python:
- "3.3"
- "3.4"
- "3.5"
- "3.6"

matrix:
include:
- python: 3.4
- python: 3.5
- python: 3.6
- python: 3.7
dist: xenial

env:
- REPOSITORY_ORIGIN=plugins

before_install:
- sudo apt-get install libudev-dev
install:
- pip install tox-travis "virtualenv<14.0.0"

Expand Down
7 changes: 7 additions & 0 deletions __init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
def plugin_release():
return '1.6'


def plugin_branch():
return 'master'

12 changes: 11 additions & 1 deletion alexa/plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugin:
en: ''
maintainer: hotzen
tester: psilo909
state: deprecated
# keywords: iot xyz
# documentation: https://github.com/smarthomeNG/smarthome/wiki/CLI-Plugin # url of documentation (wiki) page
support: https://knx-user-forum.de/forum/supportforen/smarthome-py/1021150-amazon-alexa-plugin
Expand Down Expand Up @@ -35,4 +36,13 @@ parameters:

item_attributes:
# Definition of item attributes defined by this plugin


item_structs:
# Definition of item-structure templates for this plugin

plugin_functions: NONE
# Definition of plugin functions defined by this plugin

logic_parameters: NONE
# Definition of logic parameters defined by this plugin

Binary file added alexa4p3/Create IAM-role and Lambda.pdf
Binary file not shown.
Binary file added alexa4p3/Hoerprobe.mp3
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit fe5c3ea

Please sign in to comment.