Merge pull request #346 from pylast/updates

.github/workflows/lint.yml

@@ -2,9 +2,12 @@ name: Lint
 
 on: [push, pull_request]
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2

.pre-commit-config.yaml

@@ -3,33 +3,28 @@ repos:
     rev: v2.7.2
     hooks:
       - id: pyupgrade
-        args: ["--py3-plus"]
+        args: ["--py36-plus"]
 
   - repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 20.8b1
     hooks:
       - id: black
-        args: ["--target-version", "py35"]
+        args: ["--target-version", "py36"]
         # override until resolved: https://github.com/psf/black/issues/402
         files: \.pyi?$
         types: []
 
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.5.2
+    hooks:
+      - id: isort
+
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.8.3
     hooks:
       - id: flake8
         additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
 
-  - repo: https://github.com/asottile/seed-isort-config
-    rev: v2.2.0
-    hooks:
-      - id: seed-isort-config
-
-  - repo: https://github.com/timothycrosley/isort
-    rev: 5.4.2
-    hooks:
-      - id: isort
-
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.6.0
     hooks:

.travis.yml

@@ -23,7 +23,6 @@ matrix:
     - python: 3.8
     - python: 3.7
     - python: 3.6
-    - python: 3.5
     - python: 3.9-dev
     - python: 3.10-dev
     - python: pypy3

README.md

@@ -31,11 +31,13 @@ Or from requirements.txt:
 
 Note:
 
-* pylast 3.0.0+ supports Python 3.5+ ([#265](https://github.com/pylast/pylast/issues/265))
+* pyLast 4.0.0+ supports Python 3.6+.
-* pyLast 2.2.0 - 2.4.0 supports Python 2.7.10+, 3.4, 3.5, 3.6, 3.7.
+* pyLast 3.2.0 - 3.3.0 supports Python 3.5-3.8.
-* pyLast 2.0.0 - 2.1.0 supports Python 2.7.10+, 3.4, 3.5, 3.6.
+* pyLast 3.0.0 - 3.1.0 supports Python 3.5-3.7.
-* pyLast 1.7.0 - 1.9.0 supports Python 2.7, 3.3, 3.4, 3.5, 3.6.
+* pyLast 2.2.0 - 2.4.0 supports Python 2.7.10+, 3.4-3.7.
-* pyLast 1.0.0 - 1.6.0 supports Python 2.7, 3.3, 3.4.
+* pyLast 2.0.0 - 2.1.0 supports Python 2.7.10+, 3.4-3.6.
+* pyLast 1.7.0 - 1.9.0 supports Python 2.7, 3.3-3.6.
+* pyLast 1.0.0 - 1.6.0 supports Python 2.7, 3.3-3.4.
 * pyLast 0.5 supports Python 2, 3.
 * pyLast < 0.5 supports Python 2.
 
@@ -49,7 +51,6 @@ Features
  * Proxy support.
  * Internal caching support for some web services calls (disabled by default).
  * Support for other API-compatible networks like Libre.fm.
- * Python 3-friendly (Starting from 0.5).
 
 
 Getting started

setup.cfg

@@ -1,6 +1,5 @@
 [flake8]
-ignore = W503
 max_line_length = 88
 
 [tool:isort]
-known_third_party = flaky,pkg_resources,pylast,pytest,setuptools
+profile = black

setup.py

@@ -27,7 +27,7 @@ setup(
     extras_require={
         "tests": ["flaky", "pytest", "pytest-cov", "pytest-random-order", "pyyaml"]
     },
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "License :: OSI Approved :: Apache Software License",
@@ -35,7 +35,6 @@ setup(
         "Topic :: Multimedia :: Sound/Audio",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",

tests/test_artist.py

@@ -2,9 +2,10 @@
 """
 Integration (not unit) tests for pylast.py
 """
-import pylast
 import pytest
 
+import pylast
+
 from .test_pylast import WRITE_TEST, TestPyLastWithLastFm
 
 

tests/test_librefm.py

@@ -2,9 +2,10 @@
 """
 Integration (not unit) tests for pylast.py
 """
-import pylast
 from flaky import flaky
 
+import pylast
+
 from .test_pylast import PyLastTestCase, load_secrets
 
 

tests/test_network.py

@@ -5,9 +5,10 @@ Integration (not unit) tests for pylast.py
 import re
 import time
 
-import pylast
 import pytest
 
+import pylast
+
 from .test_pylast import WRITE_TEST, TestPyLastWithLastFm
 
 

tests/test_pylast.py

@@ -6,10 +6,11 @@ import os
 import sys
 import time
 
-import pylast
 import pytest
 from flaky import flaky
 
+import pylast
+
 WRITE_TEST = sys.version_info[:2] == (3, 8)
 
 

tests/test_track.py

@@ -4,9 +4,10 @@ Integration (not unit) tests for pylast.py
 """
 import time
 
-import pylast
 import pytest
 
+import pylast
+
 from .test_pylast import WRITE_TEST, TestPyLastWithLastFm
 
 

tests/test_user.py

@@ -8,9 +8,10 @@ import os
 import re
 import warnings
 
-import pylast
 import pytest
 
+import pylast
+
 from .test_pylast import TestPyLastWithLastFm
 
 

tests/unicode_test.py

@@ -1,8 +1,9 @@
 from unittest import mock
 
-import pylast
 import pytest
 
+import pylast
+
 
 def mock_network():
     return mock.Mock(_get_ws_auth=mock.Mock(return_value=("", "", "")))