Skip to content

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
fedelemantuano committed Dec 5, 2017
2 parents 3f1e618 + 9f3224d commit 6c9636c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
@@ -1,5 +1,5 @@
chainmap
mail-parser>=2.0.1, <3
mail-parser>=3
python-magic
simplejson
six
8 changes: 3 additions & 5 deletions tests/test_tika_app.py
Expand Up @@ -25,7 +25,7 @@

import simplejson as json

from mailparser import MailParser
import mailparser


unittest_path = os.path.realpath(os.path.dirname(__file__))
Expand All @@ -48,13 +48,11 @@ class TestTikaApp(unittest.TestCase):

def setUp(self):
# Init
self.parser = MailParser()
self.parser = mailparser.parse_from_file(mail_test_1)
self.tika = tika.TikaApp(file_jar=TIKA_APP_JAR)

def test_JSONDecodeError(self):
self.parser.parse_from_file(mail_test_1)

for i in self.parser.attachments_list:
for i in self.parser.attachments:

r = self.tika.extract_all_content(
payload=i["payload"], convert_to_obj=False)
Expand Down
2 changes: 1 addition & 1 deletion tikapp/version.py
Expand Up @@ -17,7 +17,7 @@
limitations under the License.
"""

__version__ = "1.2.0"
__version__ = "1.3.0"

if __name__ == "__main__":
print(__version__)

0 comments on commit 6c9636c

Please sign in to comment.