Skip to content

Commit

Permalink
Merge pull request #51 from beetbox/py36plus
Browse files Browse the repository at this point in the history
Require Python 3.6+
  • Loading branch information
sampsyo authored Aug 31, 2021
2 parents 6a5e162 + bd24f20 commit 780648c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 24 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
tox-env: [py27-test, py35-test, py36-test, py37-test,
py38-test, pypy-test]
tox-env: [py36-test, py37-test, py38-test, py39-test,
pypy-test]
os: [ubuntu-latest, windows-latest]

# Only test on a couple of versions on Windows.
exclude:
- os: windows-latest
tox-env: py35-test
- os: windows-latest
tox-env: py36-test
- os: windows-latest
Expand All @@ -31,16 +29,14 @@ jobs:

# Python interpreter versions. :/
include:
- tox-env: py27-test
python: 2.7
- tox-env: py35-test
python: 3.5
- tox-env: py36-test
python: 3.6
- tox-env: py37-test
python: 3.7
- tox-env: py38-test
python: 3.8
- tox-env: py39-test
python: 3.9
- tox-env: pypy-test
python: pypy3

Expand Down
5 changes: 5 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ To copy tags from one MediaFile to another:
Changelog
---------
v0.8.0
''''''
- MediaFile now requires Python 3.6 or later.
v0.7.0
''''''
Expand Down
2 changes: 1 addition & 1 deletion mediafile.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
import traceback


__version__ = '0.7.0'
__version__ = '0.8.0'
__all__ = ['UnreadableFileError', 'FileTypeError', 'MediaFile']

log = logging.getLogger(__name__)
Expand Down
10 changes: 2 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,13 @@ home-page = "https://github.com/beetbox/mediafile"
description-file = "README.rst"
requires = [
"six>=1.9",
"mutagen>=1.43; python_version < '3.0.0'",
"mutagen>=1.45; python_version >= '3.0.0'",
"enum34>=1.0.4; python_version < '3.4.0'",
"mutagen>=1.45",
]
requires-python = ">=3.6"
classifiers = [
'Topic :: Multimedia :: Sound/Audio',
'License :: OSI Approved :: MIT License',
'Environment :: Web Environment',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
Expand Down
12 changes: 5 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py{27,37,38}-test, py27-flake8
envlist = py{37,38}-test, py38-flake8
isolated_build = True

[tox:.package]
Expand All @@ -14,7 +14,6 @@ basepython = python3
deps =
nose
nose-show-skipped
mutagen>=1.27

[_flake8]
deps =
Expand All @@ -28,12 +27,11 @@ passenv =
NOSE_SHOW_SKIPPED # Undocumented feature of nose-show-skipped.
deps =
{test,cov}: {[_test]deps}
py{27,35}-flake8: {[_flake8]deps}
py{36,37,38,39}-flake8: {[_flake8]deps}
commands =
cov: nosetests --with-coverage {posargs}
py27-test: python -m nose {posargs}
py3{5,6,7,8}-test: python -bb -m nose {posargs}
py27-flake8: flake8 --min-version 2.7 {posargs} {[_flake8]files}
py35-flake8: flake8 --min-version 3.5 {posargs} {[_flake8]files}
py3{6,7,8,9}-test: python -bb -m nose {posargs}
py36-flake8: flake8 --min-version 3.6 {posargs} {[_flake8]files}
py37-flake8: flake8 --min-version 3.7 {posargs} {[_flake8]files}
py38-flake8: flake8 --min-version 3.8 {posargs} {[_flake8]files}
py39-flake8: flake8 --min-version 3.9 {posargs} {[_flake8]files}

0 comments on commit 780648c

Please sign in to comment.