Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit f877ae4
Merge: da02459 bc16a97
Author: Travis Shirk <travis@pobox.com>
Date:   Sat Mar 10 08:28:39 2018 -0700

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      Update twine from 1.9.1 to 1.10.0 (#168)
      Update pytest from 3.4.1 to 3.4.2 (#167)

commit bc16a97
Author: pyup.io bot <github-bot@pyup.io>
Date:   Thu Mar 8 00:29:28 2018 +0100

    Update twine from 1.9.1 to 1.10.0 (#168)

commit 257d238
Author: pyup.io bot <github-bot@pyup.io>
Date:   Tue Mar 6 17:19:09 2018 +0100

    Update pytest from 3.4.1 to 3.4.2 (#167)

commit da02459
Author: Travis Shirk <travis@pobox.com>
Date:   Sat Mar 3 22:44:48 2018 -0700

    Clean pytest_cache

commit cfa2c63
Merge: 10a3436 fba3d67
Author: Travis Shirk <travis@pobox.com>
Date:   Sun Feb 25 22:16:52 2018 -0700

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      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)

commit 10a3436
Author: Travis Shirk <travis@pobox.com>
Date:   Sun Feb 25 22:16:19 2018 -0700

    cleanup  !wip

commit fba3d67
Author: Deoren Moor <deoren@users.noreply.github.com>
Date:   Sun Feb 25 13:13:30 2018 -0600

    Update index.rst (#164)

    GitHub hosts Git repos, so update DVCS name to reflect that.

commit 9361db9
Author: pyup.io bot <github-bot@pyup.io>
Date:   Sat Feb 24 19:55:08 2018 +0100

    Update pytest from 3.4.0 to 3.4.1 (#162)

commit e8d378a
Author: pyup.io bot <github-bot@pyup.io>
Date:   Sat Feb 24 19:54:55 2018 +0100

    Update sphinx from 1.7.0 to 1.7.1 (#163)

commit 9098853
Author: Travis Shirk <travis@pobox.com>
Date:   Sun Feb 18 15:10:19 2018 -0700

    nicfit.py cc update

commit 8891167
Author: pyup.io bot <github-bot@pyup.io>
Date:   Sun Feb 18 22:36:40 2018 +0100

    Update nicfit.py from 0.7 to 0.8 (#161)

commit cb8345b
Author: pyup.io bot <github-bot@pyup.io>
Date:   Fri Feb 16 07:09:51 2018 +0100

    Update ipdb from 0.10.3 to 0.11 (#159)

commit 95fd207
Author: pyup.io bot <github-bot@pyup.io>
Date:   Mon Feb 12 18:55:02 2018 +0100

    Update sphinx from 1.6.7 to 1.7.0 (#158)

commit 244c21f
Author: pyup.io bot <github-bot@pyup.io>
Date:   Sun Feb 11 17:26:38 2018 +0100

    Update pytest-runner from 3.0 to 4.0 (#157)

commit ff03e03
Merge: 1b22d87 af7b263
Author: Travis Shirk <travis@pobox.com>
Date:   Thu Feb 8 16:42:21 2018 -0700

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      Update sphinx from 1.6.6 to 1.6.7 (#154)

commit 1b22d87
Author: Travis Shirk <travis@pobox.com>
Date:   Thu Feb 8 16:41:49 2018 -0700

    Added docs for install devel dependencies and test data.

commit af7b263
Author: pyup.io bot <github-bot@pyup.io>
Date:   Mon Feb 5 23:16:40 2018 +0100

    Update sphinx from 1.6.6 to 1.6.7 (#154)

commit d685c21
Author: pyup.io bot <github-bot@pyup.io>
Date:   Thu Feb 1 04:35:02 2018 +0100

    Update pytest from 3.3.2 to 3.4.0 (#152)

commit ed3c215
Author: pyup.io bot <github-bot@pyup.io>
Date:   Mon Jan 29 03:00:44 2018 +0100

    Update factory-boy from 2.9.2 to 2.10.0 (#150)

commit 62a1229
Author: pyup.io bot <github-bot@pyup.io>
Date:   Fri Jan 12 23:31:07 2018 +0100

    Update sphinx from 1.6.5 to 1.6.6 (#148)

commit 06601be
Author: pyup.io bot <github-bot@pyup.io>
Date:   Fri Jan 5 17:20:38 2018 +0100

    Update pytest from 3.3.1 to 3.3.2 (#147)

commit 04766bd
Merge: dc64168 99f3b61
Author: Travis Shirk <travis@pobox.com>
Date:   Wed Jan 3 17:00:08 2018 -0700

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      Update pyaml from 17.10.0 to 17.12.1 (#138)

commit dc64168
Author: Travis Shirk <travis@pobox.com>
Date:   Wed Jan 3 16:58:56 2018 -0700

    chg: Removed paver as a dep

commit 99f3b61
Author: pyup.io bot <github-bot@pyup.io>
Date:   Sat Dec 30 04:36:13 2017 +0100

    Update pyaml from 17.10.0 to 17.12.1 (#138)

commit 25c4db7
Merge: 5e0783c bd1d174
Author: Travis Shirk <travis@pobox.com>
Date:   Fri Dec 15 20:27:00 2017 -0700

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      Update python-magic to 0.4.15 (#130)
      Update pip-tools from 1.10.2 to 1.11.0 (#129)
      Update pytest from 3.3.0 to 3.3.1 (#131)
      Update pytest from 3.2.5 to 3.3.0 (#128)
      Update sphinx-issues from 0.3.1 to 0.4.0 (#127)

commit 5e0783c
Author: Travis Shirk <travis@pobox.com>
Date:   Fri Dec 15 20:26:16 2017 -0700

    chg: removed fabfile and mkenv

commit bd1d174
Author: pyup.io bot <github-bot@pyup.io>
Date:   Tue Dec 12 05:32:42 2017 +0100

    Update python-magic to 0.4.15 (#130)

    * Update python-magic from 0.4.13 to 0.4.15

    * Update python-magic from 0.4.13 to 0.4.15

commit 0abe2e8
Author: pyup.io bot <github-bot@pyup.io>
Date:   Fri Dec 8 16:38:37 2017 +0100

    Update pip-tools from 1.10.2 to 1.11.0 (#129)

commit 89a42f4
Author: pyup.io bot <github-bot@pyup.io>
Date:   Thu Dec 7 00:45:03 2017 +0100

    Update pytest from 3.3.0 to 3.3.1 (#131)

commit 41b6a84
Author: pyup.io bot <github-bot@pyup.io>
Date:   Tue Nov 28 05:24:44 2017 +0100

    Update pytest from 3.2.5 to 3.3.0 (#128)

commit af9ada2
Author: pyup.io bot <github-bot@pyup.io>
Date:   Tue Nov 28 05:06:40 2017 +0100

    Update sphinx-issues from 0.3.1 to 0.4.0 (#127)

commit 76eca97
Author: pyup.io bot <github-bot@pyup.io>
Date:   Thu Nov 23 20:51:23 2017 +0100

    Update pip-tools from 1.10.1 to 1.10.2 (#126)

commit 457f88f
Author: pyup.io bot <github-bot@pyup.io>
Date:   Wed Nov 22 01:52:21 2017 +0100

    Update check-manifest from 0.35 to 0.36 (#125)

commit 308305e
Author: Travis Shirk <travis@pobox.com>
Date:   Sun Nov 19 21:41:49 2017 -0700

    pep8  !wip

commit 3b1404a
Merge: 7834abb 68b6201
Author: Travis Shirk <travis@pobox.com>
Date:   Sun Nov 19 20:37:40 2017 -0700

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      Update nicfit.py from 0.6.6 to 0.7 (#124)

commit 7834abb
Author: Travis Shirk <travis@pobox.com>
Date:   Sun Nov 19 20:36:32 2017 -0700

    new: eyed3.core.EP_MAX_SIZE_HINT

commit 68b6201
Author: pyup.io bot <github-bot@pyup.io>
Date:   Mon Nov 20 01:22:26 2017 +0100

    Update nicfit.py from 0.6.6 to 0.7 (#124)

commit 0c8be9e
Author: Travis Shirk <travis@pobox.com>
Date:   Sun Nov 19 12:33:01 2017 -0700

    [stats plugin] Skip None when sorting names.

commit 762a0f4
Author: Travis Shirk <travis@pobox.com>
Date:   Sun Nov 19 12:31:11 2017 -0700

    chg: Similarly to TextFrame, fallback to latin1 for invalid encodings

commit f0d5bf6
Author: Travis Shirk <travis@pobox.com>
Date:   Fri Nov 17 20:43:04 2017 -0700

    release prep  !wip

commit 2d70df4
Author: Travis Shirk <travis@pobox.com>
Date:   Fri Nov 17 20:20:23 2017 -0700

    fix: [display plugin] Handle comments

commit c12425c
Author: nicfit <travis@pobox.com>
Date:   Fri Nov 17 20:10:34 2017 -0700

    new: Composer (TCOM) support (#123)

commit 3094a8a
Author: Travis Shirk <travis@pobox.com>
Date:   Fri Nov 17 20:05:15 2017 -0700

    chg: More forgiving of invalid text encoding identifiers (fixes #101)

commit ed215f3
Author: Travis Shirk <travis@pobox.com>
Date:   Fri Nov 17 19:37:32 2017 -0700

    chg: More forgiving of bad Unicode in text frames (fixes #105)

commit 70706ff
Merge: b0c3325 b716732
Author: Travis Shirk <travis@pobox.com>
Date:   Fri Nov 17 19:29:01 2017 -0700

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      fix: Fix python3 setup when system encoding is not utf-8 (#120)

commit b0c3325
Author: Travis Shirk <travis@pobox.com>
Date:   Fri Nov 17 18:07:01 2017 -0700

    version bump. !wip

commit b716732
Author: gaetano-guerriero <x.guerriero@tin.it>
Date:   Sat Nov 18 02:05:56 2017 +0100

    fix: Fix python3 setup when system encoding is not utf-8 (#120)

    Under python3, opening utf-8 files like HISTORY.rst in setup.py causes encoding
    error if the default encoding for the system is not utf-8.

commit d729dc4
Author: pyup.io bot <github-bot@pyup.io>
Date:   Wed Nov 15 18:22:50 2017 +0100

    Update pytest from 3.2.4 to 3.2.5 (#122)

commit b73d7a0
Author: pyup.io bot <github-bot@pyup.io>
Date:   Wed Nov 15 18:22:07 2017 +0100

    Update pytest from 3.2.3 to 3.2.4 (#121)

commit 21de03a
Merge: 62f16fb cc4c601
Author: Travis Shirk <travis@pobox.com>
Date:   Sat Nov 4 20:51:01 2017 -0600

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      Set theme jekyll-theme-slate

commit 62f16fb
Author: Travis Shirk <travis@pobox.com>
Date:   Sat Nov 4 20:50:04 2017 -0600

    chg: eyeD3 cmd line helper turned nto session-scoped fixture

commit cc4c601
Author: nicfit <travis@pobox.com>
Date:   Sat Nov 4 20:06:38 2017 -0600

    Set theme jekyll-theme-slate

commit 7ffef22
Author: Travis Shirk <travis@pobox.com>
Date:   Sat Nov 4 18:55:15 2017 -0600

    fix: Help pymagic with poorly encoded filenames

commit d7f1711
Author: Travis Shirk <travis@pobox.com>
Date:   Sat Nov 4 14:14:50 2017 -0600

    new: Check for version incompatibilities during setter, and slight refactor.

commit d635846
Merge: 32c3551 32d9a61
Author: Travis Shirk <travis@pobox.com>
Date:   Sat Nov 4 10:43:32 2017 -0600

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      pep8 !wip

commit 32c3551
Author: Travis Shirk <travis@pobox.com>
Date:   Sat Nov 4 10:25:33 2017 -0600

    fix: [display plugin] Handle internal exception types. Fixes #118

commit 87f80df
Author: Travis Shirk <travis@pobox.com>
Date:   Sat Nov 4 10:15:45 2017 -0600

    chg: Only warn about missing grako when the plugin is used. Fixes #115

commit 32d9a61
Merge: 73c613c 54b4735
Author: Travis Shirk <travis@pobox.com>
Date:   Sat Nov 4 08:39:47 2017 -0600

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      fix: IOError (nor OSError) have a message attr.
      Fix bad frames detection in stats plugin for python3 (#113)
      script exits with 0 status when called with --version/--help (#109)
      Update pytest-runner from 2.12.1 to 3.0 (#108)
      Update sphinx from 1.6.4 to 1.6.5 (#106)
      Update flake8 from 3.4.1 to 3.5.0 (#107)
      Release prep.  !wip
      fix: Reload and process after tag removals, fixes #102. (PR #103)
      pep doc strings.  !wip
      Update nicfit.py from 0.6.5 to 0.6.6 (#100)
      Update pyaml from 17.8.0 to 17.10.0 (#99)

commit 54b4735
Author: Travis Shirk <travis@pobox.com>
Date:   Fri Nov 3 18:46:13 2017 -0600

    fix: IOError (nor OSError) have a message attr.

commit f1d7160
Author: gaetano-guerriero <x.guerriero@tin.it>
Date:   Wed Nov 1 00:35:23 2017 +0100

    Fix bad frames detection in stats plugin for python3 (#113)

    Comparison of string vs binary string was preventing detection of private frames
    in stats plugin.

commit 6916b24
Author: gaetano-guerriero <x.guerriero@tin.it>
Date:   Wed Nov 1 00:23:56 2017 +0100

    script exits with 0 status when called with --version/--help (#109)

    finally clause in _main() function was blocking argparse behaviour of exiting
    with 0 status code when those options are used.

commit 19e29cd
Author: pyup.io bot <github-bot@pyup.io>
Date:   Sun Oct 29 18:45:03 2017 +0100

    Update pytest-runner from 2.12.1 to 3.0 (#108)

commit 2abec50
Author: pyup.io bot <github-bot@pyup.io>
Date:   Thu Oct 26 17:12:40 2017 +0200

    Update sphinx from 1.6.4 to 1.6.5 (#106)

commit c91d4db
Author: pyup.io bot <github-bot@pyup.io>
Date:   Thu Oct 26 17:12:21 2017 +0200

    Update flake8 from 3.4.1 to 3.5.0 (#107)

commit 73c613c
Merge: 7cb06a8 24a6888
Author: Travis Shirk <travis@pobox.com>
Date:   Mon Oct 9 00:07:43 2017 -0600

    Merge branch 'master' of github.com:nicfit/eyeD3

    * 'master' of github.com:nicfit/eyeD3:
      Update pytest from 3.2.2 to 3.2.3 (#98)
      Update tox from 2.9.0 to 2.9.1 (#97)
      Update tox from 2.8.2 to 2.9.0 (#96)
      Update pip-tools from 1.9.0 to 1.10.1 (#95)
      Update sphinx from 1.6.3 to 1.6.4 (#93)

commit 7cb06a8
Author: Travis Shirk <travis@pobox.com>
Date:   Mon Oct 9 00:07:09 2017 -0600

    pep8 !wip
  • Loading branch information
nicfit committed Mar 10, 2018
1 parent 9540cbc commit 76e4f6a
Show file tree
Hide file tree
Showing 36 changed files with 394 additions and 302 deletions.
2 changes: 1 addition & 1 deletion .cookiecutter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ default_context:
use_bitbucket: "no"
use_github: "yes"
use_make: "yes"
use_paver: "yes"
use_paver: "no"
use_pypi_deployment_with_travis: "no"
use_pytest: "yes"
use_rtd: "no"
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
test*.id3
src/test/data
src/test/eyeD3-test-data*
.idea
.idea/
.cookiecutter.md5
_misc/

Expand Down
3 changes: 0 additions & 3 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Authors
eyeD3 is written and maintained by:

* Travis Shirk <travis@pobox.com>
* nicfit <travis@pobox.com>

and has been contributed to by (ordered by date of first contribution):

Expand All @@ -31,7 +30,5 @@ and has been contributed to by (ordered by date of first contribution):
* mafro <github@mafro.net>
* Gaetano Guerriero <x.guerriero@tin.it>
* Grun Seid <grunseid@gmail.com>
* grun <grunseid@gmail.com>
* pyup.io bot <github-bot@pyup.io>
* pyup-bot <github-bot@pyup.io>
* Chris Newton <redshodan@gmail.com>
14 changes: 10 additions & 4 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
37 changes: 37 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,43 @@ Release History

.. :changelog:
v0.8.4 (2017-11-17) : The Cold Vein
-------------------------------------

New
~~~
- Composer (TCOM) support (#123)
- Check for version incompatibilities during version changes.

Changes
~~~~~~~
- More forgiving of invalid text encoding identifiers (fixes #101)
- More forgiving of bad Unicode in text frames (fixes #105)
- EyeD3 cmd line helper turned not session-scoped fixture.
- Only warn about missing grako when the plugin is used. Fixes #115.

Fix
~~~
- Fix python3 setup when system encoding is not utf-8 (#120)
<x.guerriero@tin.it>
- Fix bad frames detection in stats plugin for python3 (#113)
<x.guerriero@tin.it>
- Script exits with 0 status when called with --version/--help (#109)
<x.guerriero@tin.it>
- Help pymagic with poorly encoded filenames.
- [display plugin] Handle comments.
- [display plugin] Handle internal exception types. Fixes #118.
- IOError (nor OSError) have a message attr.

Other
~~~~~
- Set theme jekyll-theme-slate.
- Update pytest to 3.2.5 (#122) <github-bot@pyup.io>
- Update pytest-runner to 3.0 (#108) <github-bot@pyup.io>
- Update sphinx to 1.6.5 (#106) <github-bot@pyup.io>
- Update flake8 to 3.5.0 (#107) <github-bot@pyup.io>


v0.8.3 (2017-10-22) : So Alone
-------------------------------

Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ clean-pyc:
clean-test:
rm -fr .tox/
rm -f .coverage
find . -name '.pytest_cache' -type d -exec rm -rf {} +

clean-patch:
find . -name '*.rej' -exec rm -f '{}' \;
Expand Down Expand Up @@ -141,12 +142,12 @@ 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
IFS=$$'\n';\
for auth in `git authors --list`; do \
for auth in `git authors --list | sed 's/.* <\(.*\)>/\1/'`; do \
echo "Checking $$auth...";\
grep "$$auth" AUTHORS.rst || echo "* $$auth" >> AUTHORS.rst;\
done
Expand Down
1 change: 1 addition & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-slate
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
57 changes: 0 additions & 57 deletions fabfile.py

This file was deleted.

31 changes: 0 additions & 31 deletions mkenv.sh

This file was deleted.

2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 9 additions & 10 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
Sphinx==1.6.4
check-manifest==0.35
Sphinx==1.7.1
check-manifest==0.36
cogapp==2.5.1
flake8==3.4.1
flake8==3.5.0
git+https://github.com/nicfit/gitchangelog.git
hg+https://nicfit@bitbucket.org/nicfit/sphinxcontrib-bitbucket
ipdb==0.10.3
nicfit.py[cookiecutter]==0.6.6
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
2 changes: 1 addition & 1 deletion requirements/main.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pathlib==1.0.1
python-magic==0.4.13
python-magic==0.4.15
six==1.11.0
1 change: 0 additions & 1 deletion requirements/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ dev:
- tox
- twine
- wheel
- paver
- cogapp
- sphinxcontrib-paverutils
- pyaml
Expand Down
6 changes: 3 additions & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
factory-boy==2.9.2
pytest==3.2.3
factory-boy==2.10.0
pytest==3.4.2
pytest-cov==2.5.1
pytest-runner==2.12.1
pytest-runner==4.0
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ directory = build/tests/coverage
[run]
omit = /tmp/*


[tool:pytest]
addopts = --verbose

Expand Down
14 changes: 7 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import io
import os
import re
import sys
Expand Down Expand Up @@ -32,10 +33,9 @@ def getPackageInfo():
key_remap = {"name": "pypi_name"}

# __about__
with open(os.path.join(os.path.abspath(os.path.dirname(__file__)),
"./src",
"eyed3",
"__about__.py")) as infof:
info_fpath = os.path.join(os.path.abspath(os.path.dirname(__file__)),
"src", "eyed3", "__about__.py")
with io.open(info_fpath, encoding='utf-8') as infof:
for line in infof:
for what in info_keys:
rex = re.compile(r"__{what}__\s*=\s*['\"](.*?)['\"]"
Expand Down Expand Up @@ -64,11 +64,11 @@ def getPackageInfo():
# Info
readme = ""
if os.path.exists("README.rst"):
with open("README.rst") as readme_file:
with io.open("README.rst", encoding='utf-8') as readme_file:
readme = readme_file.read()
history = ""
if os.path.exists("HISTORY.rst"):
with open("HISTORY.rst") as history_file:
with io.open("HISTORY.rst", encoding='utf-8') as history_file:
history = history_file.read().replace(".. :changelog:", "")
info_dict["long_description"] = readme + "\n\n" + history

Expand All @@ -80,7 +80,7 @@ def requirements_yaml():
reqs = {}
reqfile = os.path.join("requirements", "requirements.yml")
if os.path.exists(reqfile):
with open(reqfile) as fp:
with io.open(reqfile, encoding='utf-8') as fp:
curr = None
for line in [l for l in [l.strip() for l in fp.readlines()]
if l and not l.startswith("#")]:
Expand Down
4 changes: 2 additions & 2 deletions src/eyed3/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ def __parse_version(v): # pragma: nocover
return ver, rel, ver_info


__version__ = "0.8.3"
__release_name__ = "So Alone"
__version__ = "0.8.4"
__release_name__ = "The Cold Vein"
__years__ = "2002-2017"

_, __release__, __version_info__ = __parse_version(__version__)
Expand Down
Loading

0 comments on commit 76e4f6a

Please sign in to comment.