Merge branch 'develop'

Author: proycon

bootstrap.sh

@@ -24,7 +24,7 @@ boldblue=${bold}$(tput setaf 4) #  blue
 boldyellow=${bold}$(tput setaf 3) #  yellow
 normal=$(tput sgr0)
 
-export LM_VERSION="v2.16" #NOTE FOR DEVELOPER: also change version number in codemeta.json *AND* roles/lamachine-core/defaults/main.yml -> lamachine_version!
+export LM_VERSION="v2.17" #NOTE FOR DEVELOPER: also change version number in codemeta.json *AND* roles/lamachine-core/defaults/main.yml -> lamachine_version!
 echo "${bold}=====================================================================${normal}"
 echo "           ,              ${bold}LaMachine $LM_VERSION${normal} - NLP Software distribution"
 echo "          ~)                     (http://proycon.github.io/LaMachine)"

codemeta.json

@@ -10,7 +10,7 @@
     "@type": "SoftwareSourceCode",
     "identifier": "lamachine",
     "name": "LaMachine",
-    "version": "2.16",
+    "version": "2.17",
     "description": "LaMachine is a unified software distribution for Natural Language Processing. We integrate numerous open-source NLP tools, programming libraries, web-services, and web-applications in a single Virtual Research Environment that can be installed on a wide variety of machines.",
     "license": "https://spdx.org/licenses/GPL-3.0",
 	"url": "https://proycon.github.io/LaMachine",

roles/lamachine-core/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-lamachine_version: "2.16" #also change in bootstrap.sh and codemeta.json
+lamachine_version: "2.17" #also change in bootstrap.sh and codemeta.json
 conf_name: "default"
 version: "stable" #stable, development or custom
 controller: internal

roles/languagemachines-python-bindings/tasks/main.yml

@@ -6,13 +6,27 @@
       include_role:
         name: lamachine-python-install
       with_items:
-          - { github_user: "proycon", github_repo: "python-timbl", pip: "python3-timbl", conda: "", setup: "setup3.py" }
           - { github_user: "proycon", github_repo: "python-ucto", pip: "python-ucto", conda: "" }
           - { github_user: "proycon", github_repo: "python-frog", pip: "python-frog", conda: "" }
       loop_control:
           loop_var: package
 
 
+    - block:
+      - name: Installing Python bindings (2)
+        include_role:
+          name: lamachine-python-install
+        with_items:
+            - { github_user: "proycon", github_repo: "python-timbl", pip: "python3-timbl", conda: "", setup: "setup3.py" }
+        loop_control:
+            loop_var: package
+      rescue:
+      - name: "python-timbl failure?"
+        fail:
+          msg: "Python-timbl installation failed!"
+        when: ansible_distribution|lower != "macosx"
+
+
     - name: Triggering manual mode for Colibri Core #otherwise setup.py will attempt to recompile c++ sources (and fail on a permission issue)
       file:
         path: "{{source_path}}/colibri-core/manual"
@@ -43,11 +57,20 @@
           allow_failure: "{{ignore_tests|bool}}"
       with_items:
           - ucto
-          - timbl
           - frog
           - colibricore
       ignore_errors: "{{ignore_tests|bool}}"
 
+    - name: Testing Python bindings (2)
+      include_role:
+          name: lamachine-run
+      vars:
+          command: "python3 -c 'import {{ item }}'"
+          allow_failure: "{% if ignore_tests|bool or ansible_distribution|lower == 'macosx' %}True{%else%}False{% endif %}"
+      with_items:
+          - timbl
+      ignore_errors: "{% if ignore_tests|bool or ansible_distribution|lower == 'macosx' %}True{%else%}False{% endif %}"
+
     - name: Updating metadata for CLARIAH software
       include_role:
         name: lamachine-register

roles/phonetisaurus/tasks/main.yml

@@ -8,7 +8,7 @@
           FORCE=0
           {% endif %}
           r=0
-          if [ $force -eq 1 ] || [ ! -d openfst-{{openfst_version}} ]; then
+          if [ $FORCE -eq 1 ] || [ ! -d openfst-{{openfst_version}} ]; then
             rm -Rf "openfst-{{openfst_version}}" > /dev/null 2>/dev/null
             wget http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-{{openfst_version}}.tar.gz
             r=$?