Merge branch 'release/v1.8.1' into develop

CHANGELOG.rst

@@ -1,6 +1,12 @@
 
 Changelog
 =========
+v1.8.1 (2019/12/09)
+-------------------
+- pybpod-api (v1.8.1)
+    - Fixed global_timer output actions for GlobalTimerTrig
+    - Fixed default send_events value on set_global_timer to 1 (as expected in the Bpod firmware)
+
 v1.8.0 (2019/11/09)
 -------------------
 - PyBpod's version number is now shared between the main packages of PyBpod

README.md

@@ -1,64 +1,89 @@
 # PyBpod #
 
-**version:** 1.7.8
+**version:** 1.8.1
 
 PyBpod is a GUI application that enables interaction with the Bpod device from [Sanworks](https://sanworks.io/).
 
 This project is maintained by a team of SW developers at the Champalimaud Foundation.
 
 ## Install PyBpod ##
+
 1. Download & install [Anaconda](https://www.anaconda.com/download/) or [Miniconda](https://conda.io/miniconda.html) to your user.
+
 2. After the installation, open "Anaconda Prompt"
+
 3. Create a virtual environment for running PyBpod with Python 3.6
-```
-conda create -n pybpod-environment python=3.6
-```
+
+    ```bash
+    conda create -n pybpod-environment python=3.6
+    ```
+
 4. Activate the environment you just created
-```
-activate pybpod-environment
-```
+
+    ```bash
+    activate pybpod-environment
+    ```
+
 5. Install PyBpod through PyPI
-```
-pip install pybpod
-```
+
+    ```bash
+    pip install pybpod
+    ```
+
 6. Run the application.
-```
-start-pybpod
-```
+
+    ```bash
+    start-pybpod
+    ```
 
 ## Install PyBpod (for developers) ##
 
 1. Download & install [Anaconda](https://www.anaconda.com/download/) or [Miniconda](https://conda.io/miniconda.html) .
 
-**Note:**
-On windows if you install Anaconda/Miniconda for all the users, you should make sure you run the "Anaconda Prompt" as administrator.
-To avoid issues, make sure you install Anaconda/Miniconda only for your user.
+    **Note:**
+    On windows if you install Anaconda/Miniconda for all the users, you should make sure you run the "Anaconda Prompt" as administrator.
+    To avoid issues, make sure you install Anaconda/Miniconda only for your user.
 
 2. Create a virtual environment for running PyBpod with Python 3.6
-```
-conda create -n pybpod-environment python=3.6
-```
+
+    ```bash
+    conda create -n pybpod-environment python=3.6
+    ```
+
 3. Activate the environment you just created.
-```
-activate pybpod-environment
-```
-3. Clone the PyBpod repository.
-```
-git clone https://github.com/pybpod/pybpod.git
-```
+
+    ```bash
+    activate pybpod-environment
+    ```
+
+4. Clone the PyBpod repository.
+
+    ```bash
+    git clone https://github.com/pybpod/pybpod.git
+    ```
+
 5. Access the created repository folder.
-```
-cd pybpod
-```
+
+    ```bash
+    cd pybpod
+    ```
+
 6. Run the "install.py" script to install all necessary dependencies.
-```
-python utils\install.py
-```
+
+    ```bash
+    python utils\install.py
+    ```
+
 7. Run the PyBpod application.
-```
-start-pybpod
-```
 
+    ```bash
+    start-pybpod
+    ```
+
+## Documentation ##
+
+Documentation is available at ReadTheDocs: <https://pybpod.readthedocs.io/>
+
+## Acknowledgments ##
 
-#### Acknowledgments ####
 PyVmMonitor is being used to support the development of this open source software. For more information please see [PyVmMonitor's web site](http://pyvmmonitor.com)

base/pybpod/setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name="pybpod",
-    version="1.8.0",
+    version="1.8.1",
     description="Pybpod is a behavioral experiments control system written in Python for Bpod",
     author=["Ricardo Ribeiro", "Luís Teixeira"],
     author_email="ricardo.ribeiro@research.fchampalimaud.org, ricardojvr@gmail.com, micboucinha@gmail.com",
@@ -21,9 +21,9 @@
     install_requires=[
         "pyforms-gui==4.901.2",
         "pyforms_generic_editor==1.5.1",
-        "pybpod-api==1.8.0",
-        "pybpod-gui-api==1.8.0",
-        "pybpod-gui-plugin==1.8.0",
+        "pybpod-api==1.8.1",
+        "pybpod-gui-api==1.8.1",
+        "pybpod-gui-plugin==1.8.1",
         "pge-plugin-terminal==0.1",
         "pybpod-gui-plugin-session-history==1.4.2",
         "pybpod-gui-plugin-stmdiagram==1.0.0",

docs/source/conf.py

@@ -28,7 +28,7 @@
 copyright = '2018, Ricardo Ribeiro'
 author = 'Ricardo Ribeiro'
 
-version = release = '1.8.0'
+version = release = '1.8.1'
 
 
 # -- General configuration ---------------------------------------------------