Release prep

nicfit · Nov 9, 2019 · 807abaf · 807abaf
1 parent 3758cc5
commit 807abaf
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,16 @@ Release History
 
 .. :changelog:
 
+v0.8.11 (2019-11-09)
+------------------------
+
+Fix
+~~~
+- ID3 v2.3 to v2.4 date conversion.
+- Match mp3 mime-types against all possible mime-types.
+  Specifically, application/x-font-gdos. Fixes #338
+
+
 v0.8.10 (2019-03-07) : Apples
 ------------------------------
 

diff --git a/requirements/requirements.yml b/requirements/requirements.yml
@@ -12,7 +12,8 @@ extra_art-plugin:
     - pillow
 
 test:
-    - pytest
+    # 4.x series required for python <= 3.4
+    - pytest>=4.1.1
     - pytest-cov
     - pytest-runner
     - factory-boy

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -1,5 +1,5 @@
 factory-boy==2.11.1
 mock; python_version < "3.4"
-pytest==4.1.1
 pytest-cov==2.6.1
 pytest-runner==4.2
+pytest>=4.1.1
diff --git a/src/eyed3/__about__.py b/src/eyed3/__about__.py
@@ -15,8 +15,8 @@ def __parse_version(v):                                       # pragma: nocover
     return ver, rel, ver_info
 
 
-__version__ = "0.8.10"
-__release_name__ = "Apples"
+__version__ = "0.8.11"
+__release_name__ = ""
 __years__ = "2002-2019"
 
 _, __release__, __version_info__ = __parse_version(__version__)

diff --git a/src/eyed3/mp3/__init__.py b/src/eyed3/mp3/__init__.py
@@ -48,11 +48,11 @@ def __init__(self, file_obj, start_offset, tag):
         self.mp3_header = None
         self.xing_header = None
         self.vbri_header = None
+        # If not ``None``, the Lame header.
+        # See :class:`eyed3.mp3.headers.LameHeader`
         self.lame_tag = None
-        '''If not ``None``, the Lame header.
-        See :class:`eyed3.mp3.headers.LameHeader`'''
+        # 2-tuple, (vrb?:boolean, bitrate:int)
         self.bit_rate = (None, None)
-        '''2-tuple, (vrb?:boolean, bitrate:int)'''
 
         header_pos = 0
         while self.mp3_header is None:
@@ -121,8 +121,7 @@ def __init__(self, file_obj, start_offset, tag):
 
         # Compute bitate
         if (self.xing_header and self.xing_header.vbr and
-                self.xing_header.numFrames):    # if xing_header.numFrames == 0
-                                                # ZeroDivisionError
+                self.xing_header.numFrames):  # if xing_header.numFrames == 0, ZeroDivisionError
             br = int((self.xing_header.numBytes * 8) /
                      (tpf * self.xing_header.numFrames * 1000))
             vbr = True

diff --git a/src/eyed3/utils/__init__.py b/src/eyed3/utils/__init__.py
@@ -68,7 +68,6 @@ def guess_type(self, filename, all_types=False):
             return types.split(delim)[0]
 
 
-
 _mime_types = MagicTypes()
 
 

diff --git a/tox.ini b/tox.ini
@@ -11,7 +11,6 @@ deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/requirements/test.txt
 
-
 [testenv:report]
 commands =
     coverage report --rcfile=setup.cfg