parcyl up

Makefile

@@ -69,6 +69,7 @@ clean-pyc:
 	find . -name '__pycache__' -exec rm -fr {} +
 
 clean-test:
+	tox -e clean
 	rm -fr .tox/
 	rm -f .coverage
 	find . -name '.pytest_cache' -type d -exec rm -rf {} +
@@ -88,7 +89,7 @@ test:
 	pytest $(_PYTEST_OPTS) $(_PDB_OPTS) ${TEST_DIR}
 
 test-all:
-	tox
+	tox --parallel=all
 
 test-data:
 	# Move these to eyed3.nicfit.net
@@ -106,9 +107,7 @@ pkg-test-data:
 	 tar czf ./build/${TEST_DATA_FILE} -C ./src/test ./eyeD3-test-data
 
 coverage:
-	pytest --cov=./src/eyed3 \
-           --cov-report=html --cov-report term \
-           --cov-config=setup.cfg ${TEST_DIR}
+	tox -e default,coverage
 
 coverage-view: coverage
 	${BROWSER} build/tests/coverage/index.html;\

parcyl.py

@@ -167,13 +167,6 @@ def __init__(self, info_file=None, **setup_attrs):
             Path(info_file).write_text(f"""
 import dataclasses
 
-project_name = "{self.attrs['name']}"
-version      = "{self.attrs['version']}"
-release_name = "{self.attrs['release_name']}"
-author       = "{self.attrs['author']}"
-author_email = "{self.attrs['author_email']}"
-years        = "{self.attrs['years']}"
-
 @dataclasses.dataclass
 class Version:
     major: int
@@ -182,8 +175,15 @@ class Version:
     release: str
     release_name: str
 
+project_name = "{self.attrs['name']}"
+version      = "{self.attrs['version']}"
+release_name = "{self.attrs['release_name']}"
+author       = "{self.attrs['author']}"
+author_email = "{self.attrs['author_email']}"
+years        = "{self.attrs['years']}"
 version_info = Version({vinfo.major}, {vinfo.minor}, {vinfo.maint}, "{vinfo.release}", "{self.attrs['release_name']}")
-""".strip())   # noqa: E501
+# flake8: noqa
+""".lstrip())   # noqa: E501
 
     def __call__(self, add_status_classifiers=True, **setup_attrs):
         attrs = {}

requirements.txt

@@ -5,6 +5,6 @@ pylast==3.0.0
 python-magic==0.4.15
 certifi>=2017.4.17                       # Required by requests
 chardet>=3.0.2,<3.1.0                    # Required by requests
-idna<2.9,>=2.5                           # Required by requests
-urllib3<1.25,>=1.21.1                    # Required by requests
+idna>=2.5,<2.9                           # Required by requests
+urllib3>=1.21.1,<1.25                    # Required by requests
 requests==2.21.0

requirements/dev.txt

@@ -10,7 +10,7 @@ babel>=1.3,!=2.0                         # Required by Sphinx
 docutils>=0.11                           # Required by Sphinx
 imagesize==1.1.0                         # Required by Sphinx
 packaging==19.0                          # Required by Sphinx
-requests>=2.0.0,!=2.15,!=2.16,>=2.5.0    # Required by Sphinx,twine
+requests>=2.5.0,!=2.16,!=2.15            # Required by Sphinx,twine
 setuptools>=0.7.0                        # Required by Sphinx,twine
 six>=1.5                                 # Required by Sphinx
 snowballstemmer>=1.1                     # Required by Sphinx

requirements/extra_art-plugin.txt

@@ -2,6 +2,6 @@ pillow==5.4.1
 pylast==3.0.0
 certifi>=2017.4.17                       # Required by requests
 chardet>=3.0.2,<3.1.0                    # Required by requests
-idna<2.9,>=2.5                           # Required by requests
-urllib3<1.25,>=1.21.1                    # Required by requests
+idna>=2.5,<2.9                           # Required by requests
+urllib3>=1.21.1,<1.25                    # Required by requests
 requests==2.21.0

requirements/test.txt

@@ -3,15 +3,15 @@ factory-boy==2.11.1
 atomicwrites>=1.0                        # Required by pytest
 attrs>=17.4.0                            # Required by pytest
 more-itertools>=4.0.0                    # Required by pytest
-pluggy>=0.7,>=0.3.0,<1                   # Required by pytest,tox
-py>=1.5.0,<2,>=1.4.17                    # Required by pytest,tox
+pluggy>=0.7,<1                           # Required by pytest,tox
+py>=1.5.0,<2                             # Required by pytest,tox
 setuptools>=30.0.0                       # Required by pytest,tox
-six>=1.10.0,<2,>=1.0.0                   # Required by pytest,tox
+six>=1.10.0,<2                           # Required by pytest,tox
 pytest>=3.6                              # Required by pytest-cov
 coverage>=4.4                            # Required by pytest-cov
 pytest-cov==2.6.1
 pytest-runner==4.2
-filelock<4,>=3.0.0                       # Required by tox
+filelock>=3.0.0,<4                       # Required by tox
 toml>=0.9.4                              # Required by tox
 virtualenv>=1.11.2                       # Required by tox
 tox==3.7.0

src/eyed3/__about__.py

@@ -1,12 +1,5 @@
 import dataclasses
 
-project_name = "eyeD3"
-version      = "0.8.10a67"
-release_name = "Descent Into..."
-author       = "Travis Shirk"
-author_email = "travis@pobox.com"
-years        = "2002-2019"
-
 @dataclasses.dataclass
 class Version:
     major: int
@@ -15,4 +8,11 @@ class Version:
     release: str
     release_name: str
 
-version_info = Version(0, 8, 10, "b0", "Descent Into...")
+project_name = "eyeD3"
+version      = "0.8.10b0"
+release_name = ""
+author       = "Travis Shirk"
+author_email = "travis@pobox.com"
+years        = "2002-2019"
+version_info = Version(0, 8, 10, "b0", "")
+# flake8: noqa

tox.ini

@@ -1,9 +1,10 @@
 [tox]
-envlist = clean, py{36,37}, report
+envlist = clean, py{36,37}, coverage, lint
 
 [testenv:default]
 basepython = python3.7
              lint: python3.7
+             coverate: python3.7
 
 [testenv:clean]
 commands = coverage erase
@@ -16,7 +17,7 @@ commands = coverage run --rcfile=setup.cfg --source ./src/eyed3 --append -m \
            pytest {posargs:--verbose ./src/test}
 
 
-[testenv:report]
+[testenv:coverage]
 commands =
     coverage report --rcfile=setup.cfg
     coverage html --rcfile=setup.cfg