Merge branch 'release/1.2'

.travis.yml

@@ -1,3 +1,4 @@
+---
 language: python
 
 python:
@@ -8,24 +9,39 @@ python:
     - "3.6"
 
 env:
-    - TIKA_VER="1.15"
+    - TIKA_VER="1.16"
       TIKA_APP_JAR=/tmp/tika-app-${TIKA_VER}.jar
 
 before_script:
-    - curl -o ${TIKA_APP_JAR} https://archive.apache.org/dist/tika/tika-app-${TIKA_VER}.jar
+    - >
+        curl -o ${TIKA_APP_JAR}
+        https://archive.apache.org/dist/tika/tika-app-${TIKA_VER}.jar
 
 # command to install dependencies
-install: 
+install:
     - pip install -r requirements.txt
     - pip install coveralls
 
 # command to run tests
-script: 
-    - coverage run --source=tikapp/ --omit=tikapp/__main__.py tests/test_tika_app.py
-    - coverage run --source=tikapp/ --omit=tikapp/__main__.py tests/performance.py
+script:
+    - >
+        coverage run
+        --source=tikapp/
+        --omit=tikapp/__main__.py,tikapp/version.py
+        tests/test_tika_app.py
+    - >
+        coverage run
+        --source=tikapp/
+        --omit=tikapp/__main__.py,tikapp/version.py
+        tests/performance.py
     - python -m tikapp -v
     - python -m tikapp -h
     - python -m tikapp -a -f tests/files/test.zip
 
 after_success:
     coveralls
+
+notifications:
+    email: false
+    slack:
+        secure: gLkkwrBjb0jCuiqMCRM5hXPzYH+LNA5UpMcvjULKtvywVnFVren0UYVyp6h81eQhsvIZecghESTitwRwL7Ttl9/TEmiJ1fuD/pjUbRtUDQourm3zpPAlxppVaj61Hfnln6MyPW+1QIlfXpOJRl+k7RrLKTm0FxXP6TS9t9t+p97ZIVz/iOVGwYWNgeSIdxy6sdzISkMx3i3bn7tr/ILruc18wqbaBs7GzQpgjaFl0S+7PDv4vBmj/9dTYxku6G+nSuzz+Do+BXAMCdcSEn4O4HT+tYyxmkCgRqn7zM8KtAXQwNkuSdjTOZo3Pn917jZibrEj8SaqbfXW1Q2BSN30zTk6p0Y22DF26qbYcy1XX6VDL52oy9GCGth1vNGNkLh/rFQHhZfCXvaSz1jws9vrtbEtHPXaYqfA+p/Xi01N1ewLMaL8yWA9NnCNF9r178bjiKtb7TAWu7B2o2I1j3FqfvtXsQsCQvNGTUc0LFP6i3geS056J8jrtz21IXvUmAJLHY5Qx9j88/lwA2HnhJquY7pFUztjXTgl2JBsBeGgzyoERnhq75iWQATteqbBkW1t5jkivw8g5QNbwln10PQij0SvvV9Cr02W7yX2nXt77/YeHR7ddwxxTNK8xUcjJJGUdB3AAGq1R92G/rEs4WfTniS8wG0CksOqyZ2BF1Q0gdk=

README.md

@@ -1,6 +1,7 @@
 [![PyPI version](https://badge.fury.io/py/tika-app.svg)](https://badge.fury.io/py/tika-app)
 [![Build Status](https://travis-ci.org/fedelemantuano/tika-app-python.svg?branch=master)](https://travis-ci.org/fedelemantuano/tika-app-python)
 [![Coverage Status](https://coveralls.io/repos/github/fedelemantuano/tika-app-python/badge.svg?branch=master)](https://coveralls.io/github/fedelemantuano/tika-app-python?branch=master)
+[![BCH compliance](https://bettercodehub.com/edge/badge/fedelemantuano/tika-app-python?branch=develop)](https://bettercodehub.com/)
 
 # tika-app-python
 

README → README.rst

@@ -1,12 +1,13 @@
-|PyPI version| |Build Status| |Coverage Status|
+|PyPI version| |Build Status| |Coverage Status| |BCH compliance|
 
 tika-app-python
 ===============
 
 Overview
 --------
 
-tika-app-python is a wrapper for `Apache Tika App`_.
+tika-app-python is a wrapper for `Apache Tika
+App <https://tika.apache.org/>`__.
 
 Apache 2 Open Source License
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -126,13 +127,16 @@ These are all swithes:
 
 Example:
 
-\`\`\`shell $ tikapp -f example\_file -a
+.. code:: shell
 
+    $ tikapp -f example_file -a
 
 Performance tests
 -----------------
 
-These are the results of performance tests in `tests`_ folder:
+These are the results of performance tests in
+`tests <https://github.com/fedelemantuano/tika-app-python/tree/develop/tests>`__
+folder:
 
 ::
 
@@ -150,12 +154,11 @@ These are the results of performance tests in `tests`_ folder:
     tika_extract_all_content()      0.785915 sec
     tika_extract_only_content()     0.766517 sec
 
-.. _tests: https://github.com/fedelemantuano/tika-app-python/tree/develop/tests
-.. _Apache Tika App: https://tika.apache.org/
-
 .. |PyPI version| image:: https://badge.fury.io/py/tika-app.svg
    :target: https://badge.fury.io/py/tika-app
 .. |Build Status| image:: https://travis-ci.org/fedelemantuano/tika-app-python.svg?branch=master
    :target: https://travis-ci.org/fedelemantuano/tika-app-python
 .. |Coverage Status| image:: https://coveralls.io/repos/github/fedelemantuano/tika-app-python/badge.svg?branch=master
    :target: https://coveralls.io/github/fedelemantuano/tika-app-python?branch=master
+.. |BCH compliance| image:: https://bettercodehub.com/edge/badge/fedelemantuano/tika-app-python?branch=develop
+   :target: https://bettercodehub.com/

requirements.txt

@@ -1,5 +1,5 @@
-chainmap==1.0.2
-mail-parser==1.1.6
-python-magic==0.4.12
-simplejson==3.10.0
-six==1.10.0
+chainmap
+mail-parser>=2.0.1, <3
+python-magic
+simplejson
+six

setup.py

@@ -24,7 +24,7 @@
 
 current = os.path.realpath(os.path.dirname(__file__))
 
-with open(os.path.join(current, 'README')) as f:
+with open(os.path.join(current, 'README.rst')) as f:
     long_description = f.read().strip()
 
 with open(os.path.join(current, 'requirements.txt')) as f:

tests/test_tika_app.py

@@ -23,10 +23,7 @@
 import six
 import unittest
 
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import simplejson as json
 
 from mailparser import MailParser
 
@@ -41,7 +38,7 @@
 try:
     TIKA_APP_JAR = os.environ["TIKA_APP_JAR"]
 except KeyError:
-    TIKA_APP_JAR = "/opt/tika/tika-app-1.15.jar"
+    TIKA_APP_JAR = "/opt/tika/tika-app-1.16.jar"
 
 import tikapp as tika
 from tikapp.exceptions import TikaAppJarError, FilePathError

tikapp/version.py

@@ -17,7 +17,7 @@
 limitations under the License.
 """
 
-__version__ = "1.1.1"
+__version__ = "1.2.0"
 
 if __name__ == "__main__":
     print(__version__)