Merge branch 'master' into devel

* master: (27 commits)
  Update twine from 1.9.1 to 1.10.0 (#168)
  Update pytest from 3.4.1 to 3.4.2 (#167)
  cleanup  !wip
  Update index.rst (#164)
  Update pytest from 3.4.0 to 3.4.1 (#162)
  Update sphinx from 1.7.0 to 1.7.1 (#163)
  nicfit.py cc update
  Update nicfit.py from 0.7 to 0.8 (#161)
  Update ipdb from 0.10.3 to 0.11 (#159)
  Update sphinx from 1.6.7 to 1.7.0 (#158)
  Update pytest-runner from 3.0 to 4.0 (#157)
  Added docs for install devel dependencies and test data.
  Update sphinx from 1.6.6 to 1.6.7 (#154)
  Update pytest from 3.3.2 to 3.4.0 (#152)
  Update factory-boy from 2.9.2 to 2.10.0 (#150)
  Update sphinx from 1.6.5 to 1.6.6 (#148)
  Update pytest from 3.3.1 to 3.3.2 (#147)
  chg: Removed paver as a dep
  Update pyaml from 17.10.0 to 17.12.1 (#138)
  chg: removed fabfile and mkenv
  ...

.gitignore

@@ -1,6 +1,6 @@
 src/test/data
 src/test/eyeD3-test-data*
-.idea
+.idea/
 .cookiecutter.md5
 _misc/
 

CONTRIBUTING.rst

@@ -72,13 +72,19 @@ local development.
     $ cd eyed3/
     $ python setup.py develop
 
-4. Create a branch for local development::
+4. Install all dependencies for development and extra packages. For full test
+   coverage you'll also need some test data.::
+
+    $ for reqs in $(ls requirements/*.txt); do pip install -U -r $reqs ; done
+    $ make test-data
+
+5. Create a branch for local development::
 
     $ git checkout -b name-of-your-bugfix-or-feature
 
    Now you can make your changes locally.
 
-5. When you're done making changes, check that your changes pass flake8 and the
+6. When you're done making changes, check that your changes pass flake8 and the
    tests, including testing other Python versions with tox:
 
 .. code-block:: bash
@@ -89,13 +95,13 @@ local development.
 
 To get flake8 and tox, just pip install them into your virtualenv.
 
-6. Commit your changes and push your branch to GitHub.::
+7. Commit your changes and push your branch to GitHub.::
 
     $ git add .
     $ git commit -m "Your detailed description of your changes."
     $ git push origin name-of-your-bugfix-or-feature
 
-7. Submit a pull request through the GitHub website.
+8. Submit a pull request through the GitHub website.
 
 
 Pull Request Guidelines

Makefile

@@ -141,7 +141,7 @@ pre-release: lint test changelog requirements
 	@echo "RELEASE_TAG: $(RELEASE_TAG)"
 	@echo "RELEASE_NAME: $(RELEASE_NAME)"
 	check-manifest
-	@if git tag -l | grep -x ${RELEASE_TAG} > /dev/null; then \
+	@if git tag -l | grep -E '^$(RELEASE_TAG)$$' > /dev/null; then \
         echo "Version tag '${RELEASE_TAG}' already exists!"; \
         false; \
     fi

docs/index.rst

@@ -13,7 +13,7 @@ locations. Detailed instructions and links may be found on the
 :doc:`installation` page.
 
 Otherwise, if you want to live on the edge, you can pull down the source code
-from the Mercurial repository at `GitHub`_. The :doc:`installation` page has
+from the Git repository at `GitHub`_. The :doc:`installation` page has
 details for how to access the source code.
 
 .. _GitHub: https://github.com/nicfit/eyeD3

requirements.txt

@@ -6,5 +6,5 @@
 #
 grako==3.99.9
 pathlib==1.0.1
-python-magic==0.4.13
+python-magic==0.4.15
 six==1.11.0

requirements/dev.txt

@@ -1,18 +1,17 @@
-Sphinx==1.6.5
-check-manifest==0.35
+Sphinx==1.7.1
+check-manifest==0.36
 cogapp==2.5.1
 flake8==3.5.0
 git+https://github.com/nicfit/gitchangelog.git
 hg+https://[email protected]/nicfit/sphinxcontrib-bitbucket
-ipdb==0.10.3
-nicfit.py[cookiecutter]==0.7
-paver==1.2.4
-pip-tools==1.10.1
+ipdb==0.11
+nicfit.py[cookiecutter]==0.8
+pip-tools==1.11.0
 pss==1.41
-pyaml==17.10.0
-sphinx-issues==0.3.1
+pyaml==17.12.1
+sphinx-issues==0.4.0
 sphinx_rtd_theme==0.2.4
 sphinxcontrib-paverutils==1.16.0
 tox==2.9.1
-twine==1.9.1
+twine==1.10.0
 wheel==0.30.0

requirements/main.txt

@@ -1,3 +1,3 @@
 pathlib==1.0.1
-python-magic==0.4.13
+python-magic==0.4.15
 six==1.11.0

requirements/test.txt

@@ -1,4 +1,4 @@
-factory-boy==2.9.2
-pytest==3.2.5
+factory-boy==2.10.0
+pytest==3.4.2
 pytest-cov==2.5.1
-pytest-runner==3.0
+pytest-runner==4.0

setup.cfg

@@ -17,7 +17,6 @@ directory = build/tests/coverage
 [run]
 omit = /tmp/*
 
-
 [tool:pytest]
 addopts = --verbose
 

tox.ini

@@ -1,17 +1,17 @@
 [tox]
-envlist = clean, py35, py36, pypy3, report
+envlist = clean, py35, py36, py37, pypy3, report
 
 [testenv:clean]
 commands = coverage erase
 
 [testenv]
+commands = coverage run --rcfile=setup.cfg --source ./src/eyed3 --append -m \
+           pytest {posargs:--verbose ./src/test}
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/requirements/test.txt
     py27,py33,pypy: -r{toxinidir}/requirements/test_py33.txt
 
-commands =
-    coverage run --rcfile=setup.cfg --source ./src/eyed3 --append -m pytest ./src/test
 
 [testenv:report]
 commands =