Merge pull request #293 from IBM/devel

I145 release v1.2

.gitignore

@@ -1,4 +1,4 @@
-outputs/
+**/outputs/
 #*.cfg
 *.pyc
 generated/
@@ -11,3 +11,8 @@ generated/
 test.junit.xml
 data/intents/WEATHER-FAQ-CZ*
 log.log
+tests/data/dialog/g_dialogs
+.DS_Store
+**/.pytest_cache/
+ci/outputs.tar.gz
+ci/unit_tests/workspace_addjson/main_data/workspace_forAddJsonTest.json

.travis.yml

@@ -2,24 +2,40 @@ group: travis_latest
 language: python
 cache: pip
 python:
-- 2.7
+  - 2.7
+  - 3.6
 
 install:
-- pip install flake8 pytest
-- pip install unicode unidecode lxml requests openpyxl
+  - pip install -r requirements.txt -r requirements_dev.txt
+
+before_script:
+  # add scripts to PYTHONPATH
+  - export PYTHONPATH=./scripts:$PYTHONPATH
+  # stop the build if there are Python syntax errors or undefined names
+  - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+  # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
+  - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
 script:
-- ./ci/travis.sh
+  # TEMPORARILY allow Python 3.6 to fail the ./ci/travis.sh tests
+  # TODO: Once Python 3 passes the tests, revert the next lines to remove " || test ${TRAVIS_PYTHON_VERSION} == 3.6"
+  - pytest ci -v || test ${TRAVIS_PYTHON_VERSION} == 3.6
+
+after_script:
+  # deploy all 'outputs' folders to Artifactory
+  - ./scripts/artifactory/artifactory-deploy-tests-outputs.sh
+  # remove old files (older than ${ARTIFACTORY_KEEP_DAYS}) and delete empty builds and branches
+  - ./scripts/artifactory/artifactory-cleanup.sh
 
 notifications:
-#  email:
-#    recipients:
-#    - tondrej@cz.ibm.com
-#    - tomas_macek@cz.ibm.com
-#    - tereza.pytelova@cz.ibm.com
-#    on_success: change
-#    on_failure: always
-#    on_pull_requests: false
+  email:
+    recipients:
+      #- tondrej@cz.ibm.com
+      #- tomas_macek@cz.ibm.com
+      - tereza.pytelova@cz.ibm.com
+    on_success: change
+    on_failure: always
+    on_pull_requests: false
   slack:
     rooms:
       secure: yDXe4PxGoBVK+aFSl7elh/TB/c8TtF4cbv8FFNVFgK0DNIArCfOi2AoqfWfHUxHA80YHKcdXFxsIb8q9WpG/Lwmef89fapJLGkb3Qox2uEO+Cjn/rGnh6RY5q2yZbesp1alHngIwzJyxxWb1XSpgdlk+vr2V0Czm6JnepcH6LC9f2wELqFngW/DGr2mhHwjKk6GVlybd9M4VBjlSyqirUd6Yio5a4kwvvAQK6HxwvBL7JFPMQcOo5KKnWWa6KW4ptW/MxP0saghgmbMOYKkFzjkyqN1S0MNx23Vrpi0B89QsV4y4yrhjn72Kpfou8PIkeNrYgTH2r+KXJ95tVmTV05v/XXO8Ln16VtovYQXPTmmYm+fzNznDh3O2FKWOMoOTCRzTxEJzk05A/cSKS+v1a/fDfEsLq6kO4/DvW8AFEAMxJXXI4Isnv7Kqkzb0jND2Ce7NVr0bWIloneXBLpE7EpdWyCBxj4IhYzfHZk2Lw7Y/Qhz8m+NcZ7pg3wMfkQKS7X0phm5K4BvLop0ZPuGgYvZi5/nlS3dyH+71O1tjSudn5cjnLpKMbNsf7QeWoGNn8NW/X1HHy72PB8zZmqSa0Pl/EcBJBkzZciAXICrelWP1Qxwpez4M0xFC/XZ8f+Yl9lLn+BQpfL6K1nsrBy0oiw1+ERVzKDK05fPV3DbXkbw=

README.md

@@ -12,18 +12,32 @@ It aims at
 - support for internationalization
 - and more :)
 
-It countains a bundle of tools for generating WA workspace from the structure data (and viceversa), testing and uploading (working with the WCS API).
+It contains a bundle of tools for generating WA workspace from the structure data (and viceversa), testing and uploading (working with the WCS API).
 
 Currently supported conversation version is 2017-02-03 except:
-- Fuzzy matching, Folders, Digression and Pattern defined entities are not supported.
+- Fuzzy matching, Folders and Digression are not supported.
 - A name of a dialog node still has to be unique as it is used as node ID.
 - Missing "slot_in_focus" property.
-- Slots and are not supported in json to xml conversion scripts.
+- Slots are not supported in json to xml conversion scripts.
 
-Scripts use python 2.7
+Scripts use python 2.7, used modules are listed in the [requirements.txt](/requirements.txt) file. To satisfy all requirements run
+```
+pip install -r requirements.txt
+```
+For brief summary how to run scripts please see [scripts.md](/scripts.md).
 
-Please install following python modules: configparser, openpyxl, cryptography, unidecode, requests
+Description of T2C  and xml/csv WAW formats can be found in `doc` folder.
 
-For brief summary how to run scripts please see scripts.md.
+Release notes can be found in [release_notes.md](/release_notes.md).
 
-Release notes can be found in 'release_notes.md'
+Instructions on how to use logging can be found in [logging.md](/logging.md).
+
+If you want to run unit tests locally, you first need to install development dependencies from [requirements_dev.txt](/requirements_dev.txt). You can run
+```
+pip install -r requirements_dev.txt
+```
+The unit and app tests can be started with this commands (from top directory of this repository)
+```
+PYTHONPATH=./scripts:$PYTHONPATH pytest ci/unit_tests
+PYTHONPATH=./scripts:$PYTHONPATH pytest ci/app_tests
+```

ci/__init__.py

@@ -0,0 +1,23 @@
+"""
+Copyright 2019 IBM Corporation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import pytest
+
+from wawCommons import setLoggerConfig
+
+# we want to have pytest assert introspection in the test_utils
+pytest.register_assert_rewrite('ci.test_utils')
+
+setLoggerConfig()

ci/app_tests/__init__.py

@@ -0,0 +1,15 @@
+"""
+Copyright 2019 IBM Corporation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+

ci/app_tests/convertWorkspaceBackAndForth_data/build.cfg

@@ -0,0 +1,8 @@
+[common]
+scope = type-server
+
+[conversation]
+workspace_name = waw-en-app-example
+language = en
+
+