Merge 0.9 devel (no more Python2)

nicfit · Feb 9, 2019 · 2270a87 · 2270a87
1 parent e741a3f
commit 2270a87
Show file tree

Hide file tree

Showing 49 changed files with 916 additions and 1,244 deletions.
diff --git a/.cookiecutter.yml b/.cookiecutter.yml
@@ -18,18 +18,18 @@ default_context:
     project_short_description: "Python audio data toolkit (ID3 and MP3)"
     project_slug: "eyed3"
     py26: "no"
-    py27: "yes"
+    py27: "no"
     py33: "no"
-    py34: "yes"
-    py35: "yes"
+    py34: "no"
+    py35: "no"
     py36: "yes"
     py37: "yes"
     py_module: "eyed3"
     pyapp_type: "normal"
     pypi_repo_name: "eyeD3"
     pypi_username: "nicfit"
-    pypy: "yes"
-    pypy3: "yes"
+    pypy: "no"
+    pypy3: "no"
     release_date: "today"
     requirements_yaml: "yes"
     src_dir: "./src"

diff --git a/.travis.yml b/.travis.yml
@@ -2,12 +2,7 @@ language: python
 
 python:
   - "3.6"
-  - "2.7"
-  - "3.5"
-  - "3.4"
   - "3.7-dev"
-  - "pypy3"
-  - "pypy"
 
 cache:
     pip: true

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -69,6 +69,7 @@ Fix
 - Multiple fixes for display plugin %images% replacements. Fixes #176
 - Allow --remove-* options to work when there are no tags. Fixes #183
 
+
 v0.8.5 (2018-03-27) : 30$ Bag
 -----------------------------
 

diff --git a/README.rst b/README.rst
@@ -92,7 +92,7 @@ Features
 Get Started
 -----------
 
-Python 2.7, >= 3.3 is required.
+Python >= 3.6 is required.
 
 For `installation instructions`_ or more complete `documentation`_ see
 http://eyeD3.nicfit.net/

diff --git a/docs/eyed3.rst b/docs/eyed3.rst
@@ -10,18 +10,11 @@ Subpackages
     eyed3.mp3
     eyed3.plugins
     eyed3.utils
+    eyed3.vorbis
 
 Submodules
 ----------
 
-eyed3.compat module
--------------------
-
-.. automodule:: eyed3.compat
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 eyed3.core module
 -----------------
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,6 @@
+dataclasses; python_version < "3.7"
 grako==3.99.9
-pathlib; python_version < "3.4"
 pillow==5.4.1
-pylast ~= 2.0
+pylast
 python-magic==0.4.15
 requests==2.21.0
-six==1.12.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,6 +1,5 @@
 Sphinx==1.8.3
 check-manifest==0.37
-cogapp==2.5.1
 flake8==3.6.0
 hg+https://nicfit@bitbucket.org/nicfit/sphinxcontrib-bitbucket
 ipdb==0.11
@@ -10,7 +9,6 @@ pss==1.42
 pyaml==18.11.0
 sphinx-issues==1.2.0
 sphinx_rtd_theme==0.4.2
-sphinxcontrib-paverutils==1.17.0
 tox==3.7.0
 twine==1.12.1
 wheel==0.32.3
diff --git a/requirements/extra_art-plugin.txt b/requirements/extra_art-plugin.txt
@@ -1,3 +1,3 @@
 pillow==5.4.1
-pylast ~= 2.0
+pylast
 requests==2.21.0
diff --git a/requirements/main.txt b/requirements/main.txt
@@ -1,3 +1,2 @@
-pathlib; python_version < "3.4"
+dataclasses; python_version < "3.7"
 python-magic==0.4.15
-six==1.12.0
diff --git a/requirements/requirements.yml b/requirements/requirements.yml
@@ -1,13 +1,12 @@
 main:
-    - six
-    - pathlib; python_version < "3.4"
     - python-magic
+    - dataclasses; python_version < "3.7"
 
 extra_display-plugin:
     - grako
 
 extra_art-plugin:
-    - pylast ~= 2.0
+    - pylast
     - requests
     - pillow
 
@@ -16,7 +15,6 @@ test:
     - pytest-cov
     - pytest-runner
     - factory-boy
-    - mock; python_version < "3.4"
 
 dev:
     - nicfit.py[cookiecutter]
@@ -29,8 +27,6 @@ dev:
     - tox
     - twine
     - wheel
-    - cogapp
-    - sphinxcontrib-paverutils
     - pyaml
     - pss
     - sphinx-issues

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -1,5 +1,4 @@
 factory-boy==2.11.1
-mock; python_version < '3.4'
 pytest==4.1.1
 pytest-cov==2.6.1
 pytest-runner==4.2
diff --git a/setup.py b/setup.py
@@ -18,9 +18,6 @@
     "Natural Language :: English",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 2.7",
-    "Programming Language :: Python :: 3.4",
-    "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
 ]

diff --git a/src/eyed3/__about__.py b/src/eyed3/__about__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collections import namedtuple
 
 
@@ -15,8 +14,8 @@ def __parse_version(v):                                       # pragma: nocover
     return ver, rel, ver_info
 
 
-__version__ = "0.8.9"
-__release_name__ = "Descent Into..."
+__version__ = "0.9a0"
+__release_name__ = ""
 __years__ = "2002-2019"
 
 _, __release__, __version_info__ = __parse_version(__version__)

diff --git a/src/eyed3/__init__.py b/src/eyed3/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import sys
 import locale
 from .__about__ import __version__ as version

diff --git a/src/eyed3/compat.py b/src/eyed3/compat.py