Merge branch 'release/v1.8.2'

CHANGELOG.rst

@@ -1,6 +1,14 @@
 
 Changelog
 =========
+v1.8.2 (2020/02/10)
+-------------------
+- pybpod-gui-plugin (v1.8.2)
+    - Changed 'Skip all trials' button to 'Stop'
+    - Changed 'Stop trial' button to 'Skip trial'
+- pybpod-gui-plugin-emulator (v0.1.5)
+    - Update button names
+
 v1.8.1 (2019/12/09)
 -------------------
 - pybpod-api (v1.8.1)

README.md

@@ -1,6 +1,6 @@
 # PyBpod #
 
-**version:** 1.8.1
+**version:** 1.8.2
 
 PyBpod is a GUI application that enables interaction with the Bpod device from [Sanworks](https://sanworks.io/).
 

base/pybpod/.bumpversion.cfg

@@ -0,0 +1,17 @@
+[bumpversion]
+current_version = 1.8.2
+commit = False
+tag = False
+
+[bumpversion:file:setup.py]
+search = current_version = "{current_version}"
+replace = current_version = "{new_version}"
+
+[bumpversion:file:../../docs/source/conf.py]
+search = version = release = "{current_version}"
+replace = version = release = "{new_version}"
+
+[bumpversion:file:../../README.md]
+search = **version:** {current_version}
+replace = **version:** {new_version}
+

base/pybpod/setup.py

@@ -3,12 +3,14 @@
 import os
 from setuptools import setup
 
+current_version = "1.8.2"
+
 with open(os.path.join("README.md"), "r") as fd:
     long_description = fd.read()
 
 setup(
     name="pybpod",
-    version="1.8.1",
+    version=f"{current_version}",
     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 +23,9 @@
     install_requires=[
         "pyforms-gui==4.901.2",
         "pyforms_generic_editor==1.5.1",
-        "pybpod-api==1.8.1",
-        "pybpod-gui-api==1.8.1",
-        "pybpod-gui-plugin==1.8.1",
+        f"pybpod-api=={current_version}",
+        f"pybpod-gui-api=={current_version}",
+        f"pybpod-gui-plugin=={current_version}",
         "pge-plugin-terminal==0.1",
         "pybpod-gui-plugin-session-history==1.4.2",
         "pybpod-gui-plugin-stmdiagram==1.0.0",
@@ -32,9 +34,7 @@
         "pybpod-gui-plugin-waveplayer==1.0",
         "pybpod-gui-plugin-rotaryencoder==0.1.4",
         "pybpod-gui-plugin-soundcard==0.1.6",
-        "pybpod-gui-plugin-emulator==0.1.4",
+        "pybpod-gui-plugin-emulator==0.1.5",
     ],
-    entry_points={
-        "console_scripts": ["start-pybpod=pybpodgui_plugin.__main__:start"],
-    },
+    entry_points={"console_scripts": ["start-pybpod=pybpodgui_plugin.__main__:start"]},
 )

docs/source/conf.py

@@ -24,11 +24,11 @@
 
 # -- Project information -----------------------------------------------------
 
-project = 'PyBpod'
-copyright = '2018, Ricardo Ribeiro'
-author = 'Ricardo Ribeiro'
+project = "PyBpod"
+copyright = "2018-2020, Scientific Software Platform, Champalimaud Foundation"
+author = "Scientific Software Platform, Champalimaud Foundation"
 
-version = release = '1.8.1'
+version = release = "1.8.2"
 
 
 # -- General configuration ---------------------------------------------------
@@ -41,36 +41,36 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    #'sphinx.ext.intersphinx',
-    'sphinx.ext.todo',
-    'sphinx.ext.coverage',
-    'sphinx.ext.mathjax',
-    'sphinx.ext.ifconfig',
-    'sphinx.ext.viewcode',
-    'sphinx.ext.githubpages',
-    'sphinx.ext.viewcode',
-    'sphinx.ext.graphviz',
-    'sphinx.ext.inheritance_diagram',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.doctest",
+    # 'sphinx.ext.intersphinx',
+    "sphinx.ext.todo",
+    "sphinx.ext.coverage",
+    "sphinx.ext.mathjax",
+    "sphinx.ext.ifconfig",
+    "sphinx.ext.viewcode",
+    "sphinx.ext.githubpages",
+    "sphinx.ext.viewcode",
+    "sphinx.ext.graphviz",
+    "sphinx.ext.inheritance_diagram",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 source_parsers = {
-    '.md': 'recommonmark.parser.CommonMarkParser',
+    ".md": "recommonmark.parser.CommonMarkParser",
 }
 
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -85,15 +85,15 @@
 exclude_patterns = []
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'default'
+pygments_style = "default"
 
 
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'sphinx_rtd_theme'
+html_theme = "sphinx_rtd_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -104,7 +104,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static','_images']
+html_static_path = ["_static", "_images"]
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
@@ -120,7 +120,7 @@
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'PyBpoddoc'
+htmlhelp_basename = "PyBpoddoc"
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -129,15 +129,12 @@
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -147,19 +144,15 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'PyBpod.tex', 'PyBpod Documentation',
-     [author], 'manual'),
+    (master_doc, "PyBpod.tex", "PyBpod Documentation", [author], "manual"),
 ]
 
 
 # -- Options for manual page output ------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'pybpod', 'PyBpod Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "pybpod", "PyBpod Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output ----------------------------------------------
@@ -168,9 +161,15 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'PyBpod', 'PyBpod Documentation',
-     author, 'PyBpod', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "PyBpod",
+        "PyBpod Documentation",
+        author,
+        "PyBpod",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
 
 
@@ -192,28 +191,29 @@
 # epub_uid = ''
 
 # A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
+epub_exclude_files = ["search.html"]
 
 
 # -- Extension configuration -------------------------------------------------
 
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None,
-                       'python': ('https://docs.python.org/3.5', None),
-                       'pybpodapi': ('https://pybpod-api.readthedocs.io', None),
-                       'pybpodgui_api': ('https://pybpod-gui-api.readthedocs.io', None),
-                       'pybpodgui_plugin': ('http://pybpod-gui-plugin.readthedocs.io', None),
-                       'pyforms_gui' : ('https://pyforms-gui.readthedocs.io', None)
-                       }
+intersphinx_mapping = {
+    "https://docs.python.org/": None,
+    "python": ("https://docs.python.org/3.5", None),
+    "pybpodapi": ("https://pybpod-api.readthedocs.io", None),
+    "pybpodgui_api": ("https://pybpod-gui-api.readthedocs.io", None),
+    "pybpodgui_plugin": ("http://pybpod-gui-plugin.readthedocs.io", None),
+    "pyforms_gui": ("https://pyforms-gui.readthedocs.io", None),
+}
 
 # -- Options for todo extension ----------------------------------------------
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
 
-graphviz_output_format = 'svg'
+graphviz_output_format = "svg"
 
-inheritance_graph_attrs = dict(rankdir="LR", size='"10.0, 12.0"', ratio='compressed')
-inheritance_node_attrs = dict(fontsize=18, height=1.25, style='filled')
+inheritance_graph_attrs = dict(rankdir="LR", size='"10.0, 12.0"', ratio="compressed")
+inheritance_node_attrs = dict(fontsize=18, height=1.25, style="filled")

utils/deploy-pypi.py

@@ -9,48 +9,57 @@ def version_compare(loc_version, rmt_version):
     return v.parse(loc_version) > v.parse(rmt_version)
 
 
-pypi = xmlrpc.client.ServerProxy('https://pypi.org')
+pypi = xmlrpc.client.ServerProxy("https://pypi.org")
 
 DIRECTORIES_TO_SEARCH_FORM = [
-    os.path.join('libraries'),
-    os.path.join('base'),
-    os.path.join('plugins'),
+    os.path.join("libraries"),
+    os.path.join("base"),
+    os.path.join("plugins"),
 ]
 
 CURRENT_DIRECTORY = os.getcwd()
 
-Popen(['pip', 'install', '--upgrade', 'setuptools', 'wheel', 'twine'])
+Popen(["pip", "install", "--upgrade", "setuptools", "wheel", "twine"])
 
 for search_dir in DIRECTORIES_TO_SEARCH_FORM:
     for dir_name in os.listdir(search_dir):
         dir_path = os.path.abspath(os.path.join(search_dir, dir_name))
         if not os.path.isdir(dir_path):
             continue
 
-        setup_filepath = os.path.join(dir_path, 'setup.py')
+        setup_filepath = os.path.join(dir_path, "setup.py")
         if not os.path.isfile(setup_filepath):
             continue
 
         os.chdir(dir_path)
 
-        version = Popen(["python", setup_filepath, '--version'], stdout=PIPE).stdout.read()
+        version = Popen(
+            ["python", setup_filepath, "--version"], stdout=PIPE
+        ).stdout.read()
         version = version.strip().decode()
 
-        package_name = Popen(["python", setup_filepath, '--name'], stdout=PIPE).stdout.read()
-        package_name = package_name.strip().decode().replace(' ', '-')
+        package_name = Popen(
+            ["python", setup_filepath, "--name"], stdout=PIPE
+        ).stdout.read()
+        package_name = package_name.strip().decode().replace(" ", "-")
 
         remote_version = pypi.package_releases(package_name)
 
         print(dir_name, version, remote_version)
 
-        if len(remote_version) == 0 or version_compare(version, remote_version[0]) is True:
-            print('----- UPLOADING TO PYPI -----', package_name)
+        if (
+            len(remote_version) == 0
+            or version_compare(version, remote_version[0]) is True
+        ):
+            print("----- UPLOADING TO PYPI -----", package_name)
 
-            if os.path.isdir('./dist'):
-                shutil.rmtree('./dist')
+            if os.path.isdir("./dist"):
+                shutil.rmtree("./dist")
 
-            Popen(['python', 'setup.py', 'sdist', 'bdist_wheel'], stdout=PIPE).communicate()
-            Popen(['twine', 'upload', os.path.join('dist', '*')]).communicate()
+            Popen(
+                ["python", "setup.py", "sdist", "bdist_wheel"], stdout=PIPE
+            ).communicate()
+            Popen(["twine", "upload", os.path.join("dist", "*")]).communicate()
 
         os.chdir(CURRENT_DIRECTORY)