-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/release-1.5'
* origin/release-1.5: (551 commits) wunderground: user_doc updated wunderground, darksky: user_doc updated wunderground: user_doc updated wunderground: user_doc updated wunderground: user_doc updated Darksky: added user_doc.rst Backend: added blur event to trigger enforce updates items on same value Darksky: added reload parameter Darksky: text correction in webif Logo for darksky plugin Darksky: first version of web interface wunderground: user_doc updated Added PLUGIN_VERSION back in Removed plugin attributes, not neccesary due to plugin.yaml ODLInfo, Tankerkoenig: updated minimum requirements for change in init method OLDInfo: updated to new plugin system Tankerkoenig: update to parameter free init method, reformatting, removed sh reference Darksky: added item for html string AVM: simplified init method Darksky: updated to new SmartPlugin features and corrected missing cycle in plugin.yaml ... # Conflicts: # backend/BackendItems.py # backend/plugin.yaml # backend/webif/templates/items.html # backend/webif/templates/log_view.html # enigma2/README.md # mqtt/__init__.py # mqtt/plugin.yaml # rcswitch/README.md
- Loading branch information
Showing
3,077 changed files
with
58,768 additions
and
19,245 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,5 +24,8 @@ nosetests.xml | |
ehthumbs.db | ||
Thumbs.db | ||
|
||
# don't upload private plugins | ||
/priv_* | ||
|
||
# Pycharm settings | ||
/.idea |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
####################################################################### | ||
# Travis-CI script | ||
# | ||
# This script will checkout all required reqository to run the | ||
# suite. | ||
# | ||
# The following configuration settings are available: | ||
# * Environment settings: | ||
# - REPOSITORY_ORIGIN: defines the current repos origin (e.g. | ||
# "smarthome" or "plugins") | ||
# * Script settings: | ||
# - REPOSITORIES: List of repositories to checkout from smarthomeNG | ||
# organization (e.g. "https://github.com/smarthomeNG/<repo-name>") | ||
# - LINKS: Contains a list of links to create before running the | ||
# suite (e.g. "<target-repo>/<target-dir>/<source-repo>") | ||
# * Script variables: | ||
# - REPOSITORY: The name of the current repository | ||
# - REPOSITORY_ORIGIN: The origin repository from environment setting | ||
# - REPOSITORY_BRANCH: The branch to use for checkouts | ||
|
||
echo -e "travis_fold:start:Environment\nEnvironment dump" | ||
set | ||
export | ||
echo "travis_fold:end:Environment" | ||
|
||
####################################################################### | ||
# Declare some common variables | ||
|
||
REPOSITORIES="smarthome plugins" | ||
LINKS="smarthome/plugins/plugins" | ||
|
||
# Get the current repository which is processed | ||
REPOSITORY="$(basename $TRAVIS_REPO_SLUG)" | ||
REPOSITORY_ORIGIN="$REPOSITORY_ORIGIN" | ||
|
||
# Find out on which branch to work | ||
if [ "$TRAVIS_BRANCH" = "master" ] ; then | ||
REPOSITORY_BRANCH="master" | ||
else | ||
REPOSITORY_BRANCH="develop" | ||
fi | ||
|
||
|
||
####################################################################### | ||
# 1. Checkout all repositories | ||
|
||
echo -e "travis_fold:start:Checkout\nChecking out repositories with $REPOSITORY_BRANCH branch" | ||
|
||
# Change to root directory since script is started in checkout | ||
cd $TRAVIS_BUILD_DIR/.. | ||
|
||
# Check out other repositories with develop version | ||
for REPO in $REPOSITORIES ; do | ||
if [ "$REPO" != "$REPOSITORY_ORIGIN" ] ; then | ||
echo "Checking out $REPO ..." | ||
git clone https://github.com/smarthomeNG/$REPO.git $REPO | ||
cd $REPO | ||
git checkout $REPOSITORY_BRANCH | ||
cd .. | ||
fi | ||
done | ||
|
||
echo "travis_fold:end:Checkout" | ||
|
||
|
||
####################################################################### | ||
# 2. Create symlinks in repositories | ||
|
||
echo -e "travis_fold:start:Links\nCreating symlinks" | ||
|
||
# Create symlinks in core repository | ||
for LINK in $LINKS ; do | ||
TARGET=$(dirname "$LINK") | ||
TARGET_REPO=$(dirname "$TARGET") | ||
TARGET_DIR=$(basename "$TARGET") | ||
SOURCE_REPO=$(basename "$LINK") | ||
|
||
echo "Create link from $SOURCE_REPO to $TARGET_REPO/$TARGET_DIR ..." | ||
cd $TARGET_REPO | ||
rm -rf $TARGET_DIR | ||
ln -s ../$SOURCE_REPO $TARGET_DIR | ||
cd .. | ||
done | ||
|
||
echo "travis_fold:end:Links" | ||
|
||
|
||
####################################################################### | ||
# 3. Run | ||
|
||
echo -e "travis_fold:start:Suite\nRunning suite" | ||
|
||
cd smarthome | ||
tox | ||
cd .. | ||
|
||
echo "travis_fold:end:Suite" | ||
|
||
|
||
####################################################################### | ||
# 4. Docs | ||
|
||
#echo -e "travis_fold:start:Docs\nBuilding documentation" | ||
|
||
#cd smarthome/doc | ||
#yes | bash build_doc.sh | ||
#cd ../.. | ||
|
||
#echo "travis_fold:end:Docs" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
sudo: false | ||
language: python | ||
python: | ||
- "3.3" | ||
- "3.4" | ||
- "3.5" | ||
- "3.6" | ||
|
||
env: | ||
- REPOSITORY_ORIGIN=plugins | ||
|
||
install: | ||
- pip install tox-travis "virtualenv<14.0.0" | ||
|
||
script: | ||
- sh .travis.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.