Browse Source

Merged branch dev into dev_nico

nico 8 years ago
parent
commit
04b77a31a3

+ 2 - 0
.travis.yml

@@ -9,6 +9,8 @@ before_install:
 - sudo apt-get update
 - sudo apt-get install $(cat install/files/deb-packages_requirements.txt)
 - sudo apt-get install libstdc++6
+- wget https://bootstrap.pypa.io/get-pip.py
+- sudo python get-pip.py
 install: "pip install -r install/files/python_requirements.txt"
 # command to run tests
 script: pytest

+ 1 - 1
Docs/installation/debian_jessie.md

@@ -23,6 +23,6 @@ sudo python get-pip.py
 
 Then, with pip, the last release of setuptools
 ```
-sudo pip install -U pip setuptools
+sudo pip install -U setuptools
 ```
 

+ 7 - 1
Docs/installation/raspbian_jessie.md

@@ -6,7 +6,13 @@ Install some required system libraries and software:
 
 ```
 sudo apt-get update
-sudo apt-get install git python-pip python-dev libsmpeg0 libttspico-utils libsmpeg0 flac dialog libffi-dev libffi-dev libssl-dev portaudio19-dev build-essential libssl-dev libffi-dev sox libatlas3-base mplayer
+sudo apt-get install git python-dev libsmpeg0 libttspico-utils libsmpeg0 flac dialog libffi-dev libffi-dev libssl-dev portaudio19-dev build-essential libssl-dev libffi-dev sox libatlas3-base mplayer
+```
+
+Let's install the last release of python-pip
+```
+wget https://bootstrap.pypa.io/get-pip.py
+sudo python get-pip.py
 ```
 
 ## Raspberry Pi configuration

+ 12 - 8
Docs/neuron_list.md

@@ -19,15 +19,19 @@ A neuron is a module that will perform some actions attached to an order. You ca
 ## Community neuron
 
 | Name                                                                                 | Description                                                                             |
-|--------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------|
-| [gmail_checker](https://github.com/kalliope-project/kalliope_neuron_gmail)           | Get the number of unread email and their subjects from a gmail account                  |
-| [openweathermap](https://github.com/kalliope-project/kalliope_neuron_openweathermap) | Get the weather of a location                                                           |
+|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
+| [gmail_checker](https://github.com/kalliope-project/kalliope_neuron_gmail)           | Get the number of unread email and their subjects from a gmail account                     |
+| [google agenda](https://github.com/bacardi55/kalliope-google-calendar)               | Get your next meetings on google calendar                                                |
+| [list available orders](https://github.com/bacardi55/kalliope-list-available-orders) | Let kalliope tell you what she how she can help                                            |
+| [openweathermap](https://github.com/kalliope-project/kalliope_neuron_openweathermap) | Get the weather of a location                                                               |
+| [pi camera](https://github.com/bacardi55/kalliope-picamera)                          | Take picture with your picamera                                                             |
 | [pushetta](https://github.com/kalliope-project/kalliope_neuron_pushetta)             | Send a push message to a remote device like Android/iOS/Windows Phone or Chrome browser |
-| [rss_reader](https://github.com/kalliope-project/kalliope_neuron_rss_reader)         | get rss feed from website                                                               |
-| [tasker](https://github.com/kalliope-project/kalliope_neuron_tasker)                 | Send a message to Android tasker app                                                    |
-| [twitter](https://github.com/kalliope-project/kalliope_neuron_twitter)               | Send a Twit from kalliope                                                               |
-| [wake_on_lan](https://github.com/kalliope-project/kalliope_neuron_wake_on_lan)       | Wake on lan a computer                                                                  |
-| [wikipedia](https://github.com/kalliope-project/kalliope_neuron_wikipedia)           | Search for a page on Wikipedia                                                          |
+| [rss_reader](https://github.com/kalliope-project/kalliope_neuron_rss_reader)         | get rss feed from website                                                                   |
+| [tasker](https://github.com/kalliope-project/kalliope_neuron_tasker)                 | Send a message to Android tasker app                                                         |
+| [twitter](https://github.com/kalliope-project/kalliope_neuron_twitter)               | Send a Twit from kalliope                                                                   |
+| [wake_on_lan](https://github.com/kalliope-project/kalliope_neuron_wake_on_lan)       | Wake on lan a computer                                                                       |
+| [web scraper](https://github.com/bacardi55/kalliope-web-scraper)                     | Read web pages that don't provide RSS feed or APIs (by scraping html)                                                    |
+| [wikipedia](https://github.com/kalliope-project/kalliope_neuron_wikipedia)           | Search for a page on Wikipedia                                                               |
 
 Wanna add your neuron in the list? Open [an issue](../../issues) with the link of your neuron or send a pull request to update the list directly.
 

+ 0 - 1
install/files/deb-packages_requirements.txt

@@ -1,4 +1,3 @@
-python-pip
 libssl-dev
 libportaudio0
 libportaudio2

+ 1 - 0
install/files/python_requirements.txt

@@ -2,6 +2,7 @@ six==1.10.0
 SpeechRecognition>=3.5.0
 markupsafe==0.23
 pyaudio==0.2.9
+pyasn1>=0.1.8
 ansible==2.2.0.0
 python2-pythondialog==3.4.0
 jinja2==2.8

+ 2 - 2
kalliope/settings.yml

@@ -93,8 +93,8 @@ random_wake_up_answers:
 # Place here the full path of the sound file or just the name of the file in /usr/lib/kalliope/sounds
 # The file must be .wav or .mp3 format. By default two file are provided: ding.wav and dong.wav
 random_wake_up_sounds:
-  - "sounds/ding.wav"
-  - "sounds/dong.wav"
+  - "../sounds/ding.wav"
+  - "../sounds/dong.wav"
   # - "/my/personal/full/path/my_file.mp3"
 
 

+ 1 - 0
setup.py

@@ -61,6 +61,7 @@ setup(
         'SpeechRecognition>=3.5.0',
         'markupsafe==0.23',
         'pyaudio==0.2.9',
+        'pyasn1>=0.1.8',
         'ansible==2.2.0.0',
         'python2-pythondialog==3.4.0',
         'jinja2==2.8',