Version 1.8 (#25)

* Adding support for various other files (thanks to Don Tsang) * Adding missing mime types (thanks to Oleksandr)
cdgriffith · Mar 24, 2020 · f37d19a · f37d19a
1 parent 09c6cf6
commit f37d19a
Show file tree

Hide file tree

Showing 7 changed files with 219 additions and 185 deletions.
diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
@@ -33,8 +33,6 @@ jobs:
     - name: Upload to release
       uses: JasonEtco/upload-to-release@master
       with:
-        args:
-          - dist/puremagic-${PURE_MAGIC_VERSION}-py3-none-any.whl
-          - dist/puremagic-${PURE_MAGIC_VERSION}.tar.gz
+        args: dist/puremagic-${PURE_MAGIC_VERSION}-py3-none-any.whl
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,9 +5,9 @@ name: Tests
 
 on:
   push:
-    branches: [ master, development ]
+    branches: [ master, develop ]
   pull_request:
-    branches: [ master, development ]
+    branches: [ master, develop ]
 
 jobs:
   build:
@@ -40,7 +40,7 @@ jobs:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       run: |
         python -m pytest --cov=puremagic test/
-        coveralls
+        coveralls || true
     - name: Check distrubiton log description
       run: |
         pip install setuptools wheel twine

diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -10,3 +10,5 @@ A big thank you to everyone that has helped!
 - Sergey Ponomarev (stokito)
 - andrewpmk
 - bannsec
+- Don Tsang (DonaldTsang)
+- Oleksandr (msdinit)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+Version 1.8
+-----------
+
+- Adding support for various other files (thanks to Don Tsang)
+- Adding missing mime types (thanks to Oleksandr)
+
 Version 1.7
 -----------
 

diff --git a/puremagic/magic_data.json b/puremagic/magic_data.json
diff --git a/puremagic/main.py b/puremagic/main.py
@@ -19,7 +19,7 @@
 from collections import namedtuple
 
 __author__ = "Chris Griffith"
-__version__ = "1.7"
+__version__ = "1.8"
 __all__ = ['magic_file', 'magic_string', 'from_file', 'from_string',
            'ext_from_filename', 'PureError', 'magic_footer_array',
            'magic_header_array']

diff --git a/test/resources/video/test.mkv b/test/resources/video/test.mkv