diff --git a/atom.xml b/atom.xml index e5a86bf46b..227548279f 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index 423686ddb2..a9eda56938 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index ca67326a77..bed839e471 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index 0426ae6d01..d29371b97a 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 7658e6cb76..71c7fd6c83 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml index d7be9dc8b0..0fbc72cb87 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index d0a1183b5c..58936c734e 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index 201fe69b6d..832936b5d7 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index 5fcbe9fe59..66367b63ca 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index befb421688..0f9eec93f4 100644 --- a/blog/categories/presence-detection/atom.xml +++ b/blog/categories/presence-detection/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Presence-Detection | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml index 1327e082e2..59b45e7207 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index f8b3d0d520..82fcde94d8 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index 22f1d3caa6..83ae9063ec 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index fd17a7f19b..424251f633 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index 97fbd05d8a..101dc3df67 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index 15afb4f917..b222906794 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index b624a2a1b5..1271203113 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2016-05-14T15:26:28+00:00 + 2016-05-15T20:53:34+00:00 https://home-assistant.io/ diff --git a/developers/development_environment/index.html b/developers/development_environment/index.html index 6119f7fc19..b0c336787a 100644 --- a/developers/development_environment/index.html +++ b/developers/development_environment/index.html @@ -104,7 +104,7 @@

You will need to set up a development environment if you want to start developing a new feature or component for Home Assistant. Please follow these steps to get setup.
Visit the the Home Assistant repository first and click fork in the top right.

-

We suggest that you setup a virtual environment aka venv before running the setup script.

+

We suggest that you setup a virtual environment using venv before running the setup script.

$ git clone https://github.com/YOUR_GIT_USERNAME/home-assistant.git
@@ -114,6 +114,9 @@ $ script/setup
 
+

On Windows you can use python setup.py develop instead of the setup script.

+ +

After following these steps, running hass will invoke your local installation.

Testing your work

@@ -125,8 +128,6 @@ $ script/setup -

After following these steps, running hass will invoke your local installation.

-

Prevent Linter Errors

Home Assistant enforces strict PEP8 style compliance on all code submitted. You can save yourself the hassle of extra commits just to fix style errors by enabling the flake8 git commit hook. It will check your code when you attempt to commit to the repo. It will block the commit if there are any style issues, giving you a chance to fix it.

@@ -164,15 +165,21 @@ $ flake8 --install-hook
# Run this from your feature branch
-$ git fetch upstream dev # to pull the latest changes into a local dev branch
+$ git fetch upstream dev  # to pull the latest changes into a local dev branch
 $ git rebase upstream/dev # to put those changes into your feature branch before your changes
 
-

Squashing your commits

+

If rebase detects conflicts, you can repeat the following process until all changes have been resolved:

-

Your feature is done, it looks great and the tests are all passing. What now? Squash your commits, and create a pull request. Squashing your commits makes for a more readable git commit history. It’s an interactive process that is best explained by Matt Stauffer in this video.

+
    +
  1. git status will show you the file with the conflict.
  2. +
  3. Edit the file and resolving the lines between <<<< | >>>>
  4. +
  5. Add the modified file git add <file> or git add .
  6. +
  7. Continue rebase git rebase --continue
  8. +
  9. Repeat until you’ve resolved all conflicts.
  10. +

Further reading

@@ -184,6 +191,7 @@ $ git rebase upstream/dev # to put those changes into your feature branch before
  • Rest API
  • Server-sent events
  • Website
  • +
  • Home Assitant on Github - CONTRIBUTING.md
  • diff --git a/sitemap.xml b/sitemap.xml index 2ca7be5325..b777495569 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1600,26 +1600,26 @@ https://home-assistant.io/demo/frontend.html - 2016-05-14T15:25:50+00:00 + 2016-05-15T20:52:59+00:00 https://home-assistant.io/demo/index.html - 2016-05-14T15:25:50+00:00 + 2016-05-15T20:52:59+00:00 https://home-assistant.io/googlef4f3693c209fe788.html - 2016-05-14T15:25:50+00:00 + 2016-05-15T20:52:59+00:00 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html - 2016-05-14T15:25:50+00:00 + 2016-05-15T20:52:59+00:00 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html - 2016-05-14T15:25:50+00:00 + 2016-05-15T20:52:59+00:00 https://home-assistant.io/static/mdi-demo.html - 2016-05-14T15:25:50+00:00 + 2016-05-15T20:52:59+00:00