Parcourir la source

[Fix] add Debug info + fix unicode in sleep neuron

monf il y a 8 ans
Parent
commit
cbef671b79
4 fichiers modifiés avec 16 ajouts et 5 suppressions
  1. 11 1
      .travis.yml
  2. 1 1
      docker/docker.md
  3. 2 2
      kalliope/core/SynapseLauncher.py
  4. 2 1
      kalliope/neurons/sleep/sleep.py

+ 11 - 1
.travis.yml

@@ -1,8 +1,14 @@
 language: python
+
+services:
+  - docker
+
 python:
   - "2.7"
+
 # command to install dependencies
 before_install:
+- docker build --force-rm=true --build-arg branch=$TRAVIS_BRANCH -t kalliope-ubuntu1604 -f docker/ubuntu_16_04.dockerfile .
 - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
 - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse"
 - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse"
@@ -11,6 +17,10 @@ before_install:
 - 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
+script:
+  - pytest
+  - docker run -it --rm kalliope-ubuntu1604

+ 1 - 1
docker/docker.md

@@ -4,7 +4,7 @@
 
 Build the image for Ubuntu 16.04.
 ```
-docker build --force-rm=true -t kalliope-app -f ubuntu_16_04.dockerfile .
+docker build --force-rm=true -t kalliope-app -f docker/ubuntu_16_04.dockerfile .
 ```
 
 If we want a specific branch of Kalliope

+ 2 - 2
kalliope/core/SynapseLauncher.py

@@ -74,7 +74,7 @@ class SynapseLauncher(object):
                 # the order match one or more synapses
                 for tuple_el in launched_synapses_tuple:
                     launched_synapses.append(tuple_el.synapse)
-                    logger.debug("Get parameter for %s " % tuple_el.synapse.name)
+                    logger.debug("[SynapseLauncher] Get parameter for %s " % tuple_el.synapse.name)
                     parameters = NeuronParameterLoader.get_parameters(synapse_order=tuple_el.order,
                                                                       user_order=order_to_process)
                     # start the neuron list
@@ -85,7 +85,7 @@ class SynapseLauncher(object):
 
         if no_synapse_match:  # then run the default synapse
             if settings.default_synapse is not None:
-                logger.debug("No matching Synapse-> running default synapse ")
+                logger.debug("[SynapseLauncher] No matching Synapse-> running default synapse ")
                 synapses = SynapseLauncher.start_synapse(name=settings.default_synapse,
                                                          brain=brain)
                 launched_synapses.append(synapses)

+ 2 - 1
kalliope/neurons/sleep/sleep.py

@@ -11,7 +11,8 @@ class Sleep(NeuronModule):
         # check parameters
         if self._is_parameters_ok():
 
-            if isinstance(self.seconds, str):
+            if isinstance(self.seconds, str) or \
+                    isinstance(self.seconds, unicode):
                 self.seconds = float(self.seconds)
 
             time.sleep(self.seconds)