Update README.md

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.4.4 → v0.5.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.4...v0.5.0)
- [github.com/asottile/blacken-docs: 1.16.0 → 1.18.0](https://github.com/asottile/blacken-docs/compare/1.16.0...1.18.0)
- [github.com/python-jsonschema/check-jsonschema: 0.28.4 → 0.28.6](https://github.com/python-jsonschema/check-jsonschema/compare/0.28.4...0.28.6)
- [github.com/rhysd/actionlint: v1.7.0 → v1.7.1](https://github.com/rhysd/actionlint/compare/v1.7.0...v1.7.1)
- [github.com/tox-dev/pyproject-fmt: 1.7.0 → 2.1.3](https://github.com/tox-dev/pyproject-fmt/compare/1.7.0...2.1.3)

.editorconfig

@@ -11,7 +11,6 @@ charset = utf-8
 [*.py]
 indent_size = 4
 indent_style = space
-
 trim_trailing_whitespace = true
 
 # Two-space indentation

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: hugovk

.github/ISSUE_TEMPLATE.md

@@ -4,12 +4,19 @@
 
 ### What actually happened?
 
-### What versions of OS, Python and pylast are you using?
+### What versions are you using?
+
+* OS: 
+* Python: 
+* pylast: 
 
 Please include **code** that reproduces the issue.
 
-The [best reproductions](https://stackoverflow.com/help/mcve) are [self-contained scripts](https://ericlippert.com/2014/03/05/how-to-debug-small-programs/) with minimal dependencies.
+The [best reproductions](https://stackoverflow.com/help/minimal-reproducible-example)
+are
+[self-contained scripts](https://ericlippert.com/2014/03/05/how-to-debug-small-programs/)
+with minimal dependencies.
 
 ```python
-code goes here
+# code goes here
 ```

.github/labels.yml

@@ -0,0 +1,111 @@
+# Default GitHub labels
+- color: d73a4a
+  description: "Something isn't working"
+  name: bug
+- color: cfd3d7
+  description: "This issue or pull request already exists"
+  name: duplicate
+- color: a2eeef
+  description: "New feature or request"
+  name: enhancement
+- color: 7057ff
+  description: "Good for newcomers"
+  name: good first issue
+- color: 008672
+  description: "Extra attention is needed"
+  name: help wanted
+- color: e4e669
+  description: "This doesn't seem right"
+  name: invalid
+- color: d876e3
+  description: "Further information is requested"
+  name: question
+- color: ffffff
+  description: "This will not be worked on"
+  name: wontfix
+
+# Keep a Changelog labels
+# https://keepachangelog.com/en/1.0.0/
+- color: 0e8a16
+  description: "For new features"
+  name: "changelog: Added"
+- color: af99e5
+  description: "For changes in existing functionality"
+  name: "changelog: Changed"
+- color: FFA500
+  description: "For soon-to-be removed features"
+  name: "changelog: Deprecated"
+- color: 00A800
+  description: "For any bug fixes"
+  name: "changelog: Fixed"
+- color: ff0000
+  description: "For now removed features"
+  name: "changelog: Removed"
+- color: 045aa0
+  description: "In case of vulnerabilities"
+  name: "changelog: Security"
+- color: fbca04
+  description: "Exclude PR from release draft"
+  name: "changelog: skip"
+
+# Other labels
+- color: e11d21
+  description: ""
+  name: Last.fm bug
+- color: FFFFFF
+  description: ""
+  name: Milestone-0.3
+- color: FFFFFF
+  description: ""
+  name: Performance
+- color: FFFFFF
+  description: ""
+  name: Priority-High
+- color: FFFFFF
+  description: ""
+  name: Priority-Low
+- color: FFFFFF
+  description: ""
+  name: Priority-Medium
+- color: FFFFFF
+  description: ""
+  name: Type-Other
+- color: FFFFFF
+  description: ""
+  name: Type-Patch
+- color: FFFFFF
+  description: ""
+  name: Usability
+- color: 64c1c0
+  description: ""
+  name: backwards incompatible
+- color: fef2c0
+  description: ""
+  name: build
+- color: e99695
+  description: Feature that will be removed in the future
+  name: deprecation
+- color: FFFFFF
+  description: ""
+  name: imported
+- color: b60205
+  description: Removal of a feature, usually done in major releases
+  name: removal
+- color: 0366d6
+  description: "For dependencies"
+  name: dependencies
+- color: 0052cc
+  description: "Documentation"
+  name: docs
+- color: f4660e
+  description: ""
+  name: Hacktoberfest
+- color: f4660e
+  description: "To credit accepted Hacktoberfest PRs"
+  name: hacktoberfest-accepted
+- color: d65e88
+  description: "Deploy and release"
+  name: release
+- color: fef2c0
+  description: "Unit tests, linting, CI, etc."
+  name: test

.github/release-drafter.yml

@@ -0,0 +1,48 @@
+name-template: "$RESOLVED_VERSION"
+tag-template: "$RESOLVED_VERSION"
+
+categories:
+  - title: "Added"
+    labels:
+      - "changelog: Added"
+      - "enhancement"
+  - title: "Changed"
+    label: "changelog: Changed"
+  - title: "Deprecated"
+    label: "changelog: Deprecated"
+  - title: "Removed"
+    label: "changelog: Removed"
+  - title: "Fixed"
+    labels:
+      - "changelog: Fixed"
+      - "bug"
+  - title: "Security"
+    label: "changelog: Security"
+
+exclude-labels:
+  - "changelog: skip"
+
+autolabeler:
+  - label: "changelog: skip"
+    branch:
+      - "/pre-commit-ci-update-config/"
+
+template: |
+  $CHANGES
+
+version-resolver:
+  major:
+    labels:
+      - "changelog: Removed"
+  minor:
+    labels:
+      - "changelog: Added"
+      - "changelog: Changed"
+      - "changelog: Deprecated"
+      - "enhancement"
+
+  patch:
+    labels:
+      - "changelog: Fixed"
+      - "bug"
+  default: minor

.github/renovate.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base"],
+  "labels": ["changelog: skip", "dependencies"],
+  "packageRules": [
+    {
+      "groupName": "github-actions",
+      "matchManagers": ["github-actions"],
+      "separateMajorMinor": "false"
+    }
+  ],
+  "schedule": ["on the first day of the month"]
+}

.github/workflows/deploy.yml

@@ -0,0 +1,75 @@
+name: Deploy
+
+on:
+  push:
+    branches: [main]
+    tags: ["*"]
+  pull_request:
+    branches: [main]
+  release:
+    types:
+      - published
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  # Always build & lint package.
+  build-package:
+    name: Build & verify package
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: hynek/build-and-inspect-python-package@v2
+
+  # Upload to Test PyPI on every commit on main.
+  release-test-pypi:
+    name: Publish in-dev package to test.pypi.org
+    if: |
+      github.repository_owner == 'pylast'
+      && github.event_name == 'push'
+      && github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    needs: build-package
+
+    permissions:
+      id-token: write
+
+    steps:
+      - name: Download packages built by build-and-inspect-python-package
+        uses: actions/download-artifact@v4
+        with:
+          name: Packages
+          path: dist
+
+      - name: Upload package to Test PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+
+  # Upload to real PyPI on GitHub Releases.
+  release-pypi:
+    name: Publish released package to pypi.org
+    if: |
+      github.repository_owner == 'pylast'
+      && github.event.action == 'published'
+    runs-on: ubuntu-latest
+    needs: build-package
+
+    permissions:
+      id-token: write
+
+    steps:
+      - name: Download packages built by build-and-inspect-python-package
+        uses: actions/download-artifact@v4
+        with:
+          name: Packages
+          path: dist
+
+      - name: Upload package to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/labels.yml

@@ -0,0 +1,23 @@
+name: Sync labels
+
+permissions:
+  pull-requests: write
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - .github/labels.yml
+  workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: micnncim/action-label-syncer@v1
+        with:
+          prune: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -0,0 +1,22 @@
+name: Lint
+
+on: [push, pull_request, workflow_dispatch]
+
+env:
+  FORCE_COLOR: 1
+  PIP_DISABLE_PIP_VERSION_CHECK: 1
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+          cache: pip
+      - uses: pre-commit/action@v3.0.1

.github/workflows/release-drafter.yml

@@ -0,0 +1,34 @@
+name: Release drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - main
+  # pull_request event is required only for autolabeler
+  pull_request:
+    # Only following types are handled by the action, but one can default to all as well
+    types: [opened, reopened, synchronize]
+  # pull_request_target event is required for autolabeler to support PRs from forks
+  # pull_request_target:
+  #   types: [opened, reopened, synchronize]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  update_release_draft:
+    if: github.repository_owner == 'pylast'
+    permissions:
+      # write permission is required to create a GitHub Release
+      contents: write
+      # write permission is required for autolabeler
+      # otherwise, read permission is required at least
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next release notes as pull requests are merged into "main"
+      - uses: release-drafter/release-drafter@v6
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/require-pr-label.yml

@@ -0,0 +1,22 @@
+name: Require PR label
+
+on:
+  pull_request:
+    types: [opened, reopened, labeled, unlabeled, synchronize]
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+      - uses: mheap/github-action-required-labels@v5
+        with:
+          mode: minimum
+          count: 1
+          labels:
+            "changelog: Added, changelog: Changed, changelog: Deprecated, changelog:
+            Fixed, changelog: Removed, changelog: Security, changelog: skip"

.github/workflows/test.yml

@@ -0,0 +1,54 @@
+name: Test
+
+on: [push, pull_request, workflow_dispatch]
+
+env:
+  FORCE_COLOR: 1
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["pypy3.10", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
+          cache: pip
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install -U wheel
+          python -m pip install -U tox
+
+      - name: Tox tests
+        run: |
+          tox -e py
+        env:
+          PYLAST_API_KEY: ${{ secrets.PYLAST_API_KEY }}
+          PYLAST_API_SECRET: ${{ secrets.PYLAST_API_SECRET }}
+          PYLAST_PASSWORD_HASH: ${{ secrets.PYLAST_PASSWORD_HASH }}
+          PYLAST_USERNAME: ${{ secrets.PYLAST_USERNAME }}
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@v3.1.5
+        with:
+          flags: ${{ matrix.os }}
+          name: ${{ matrix.os }} Python ${{ matrix.python-version }}
+
+  success:
+    needs: test
+    runs-on: ubuntu-latest
+    name: Test successful
+    steps:
+      - name: Success
+        run: echo Test successful

.pre-commit-config.yaml

@@ -0,0 +1,74 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.5.0
+    hooks:
+      - id: ruff
+        args: [--exit-non-zero-on-fix]
+
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.4.2
+    hooks:
+      - id: black
+
+  - repo: https://github.com/asottile/blacken-docs
+    rev: 1.18.0
+    hooks:
+      - id: blacken-docs
+        args: [--target-version=py38]
+        additional_dependencies: [black]
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-merge-conflict
+      - id: check-json
+      - id: check-toml
+      - id: check-yaml
+      - id: debug-statements
+      - id: end-of-file-fixer
+      - id: forbid-submodules
+      - id: trailing-whitespace
+        exclude: .github/(ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE).md
+
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.28.6
+    hooks:
+      - id: check-github-workflows
+      - id: check-renovate
+
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.7.1
+    hooks:
+      - id: actionlint
+
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: 2.1.3
+    hooks:
+      - id: pyproject-fmt
+
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.18
+    hooks:
+      - id: validate-pyproject
+
+  - repo: https://github.com/tox-dev/tox-ini-fmt
+    rev: 1.3.1
+    hooks:
+      - id: tox-ini-fmt
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.8
+    hooks:
+      - id: prettier
+        args: [--prose-wrap=always, --print-width=88]
+        exclude: .github/(ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE).md
+
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes
+
+ci:
+  autoupdate_schedule: quarterly

.scrutinizer.yml

@@ -1,9 +0,0 @@
-checks:
-    python:
-        code_rating: true
-        duplicate_code: true
-filter:
-    excluded_paths:
-        - '*/test/*'
-tools:
-    external_code_coverage: true

.travis.yml

@@ -1,47 +0,0 @@
-language: python
-
-cache: pip
-
-env:
-  global:
-  - secure: ivg6II471E9HV8xyqnawLIuP/sZ0J63Y+BC0BQcRVKtLn/K3zmD1ozM3TFL9S549Nxd0FqDKHXJvXsgaTGIDpK8sxE2AMKV5IojyM0iAVuN7YjPK9vwSlRw1u0EysPMFqxOZVQnoDyHrSGIUrP/VMdnhBu6dbUX0FyEkvZshXhY=
-  - secure: gDWNEYA1EUv4G230/KzcTgcmEST0nf2FeW/z/prsoQBu+TWw1rKKSJAJeMLvuI1z4aYqqNYdmqjWyNhhVK3p5wmFP2lxbhaBT1jDsxxFpePc0nUkdAQOOD0yBpbBGkqkjjxU34HjTX2NFNEbcM3izVVE9oQmS5r4oFFNJgdL91c=
-  - secure: RpsZblHFU7a5dnkO/JUgi70RkNJwoUh3jJqVo1oOLjL+lvuAmPXhI8MDk2diUk43X+XCBFBEnm7UCGnjUF+hDnobO4T+VrIFuVJWg3C7iKIT+YWvgG6A+CSeo/P0I0dAeUscTr5z4ylOq3EDx4MFSa8DmoWMmjKTAG1GAeTlY2k=
-  - secure: T5OKyd5Bs0nZbUr+YICbThC5GrFq/kUjX8FokzCv7NWsYaUWIwEmMXXzoYALoB3A+rAglOx6GABaupoNKKg3tFQyxXphuMKpZ8MasMAMFjFW0d7wsgGy0ylhVwrgoKzDbCQ5FKbohC+9ltLs+kKMCQ0L+MI70a/zTfF4/dVWO/o=
-  - secure: DxBvGGoIgbAeuuU3A6+J1HBbmUAEvqdmK73etw+yNKDLGvvukgTL33dNCr8CZXLKRRvfhrjU7Q01GUpOTxrVQ9nJgsD55kwx0wPtuBWIF80M2m4SPsiVLlwP/LFYD5JMDTDWjFTlVahma8P7qoLjCc7b/RgigWLidH19snQmjdY=
-  - secure: VPARlWNg/0Nit7a924vJlDfv7yiuTDtrcGZNFrZ6yN3dl8ZjVPizQXQNKA3yq0y2jW25nwjRwZYj3eY5MdM9F7Sw51d+/8AjFtdCuRgDvwlQFR/pCoyzqgJATkXKo7mlejvnA+5EKUzAmu3drIbboFgbLgRTMrG7b/ot9tazTHs=
-  - secure: CQYL7MH6tSVrCcluIfWfDSTo4E/p+9pF0eI7Vtf0oaZBzyulODHK8h/mzJp4HwezyfOu0RCedq6sloGQr1/29CvWWESaYyoGoGz9Mz2ZS+MpIcjGISfZa+x4vSp6QPFvd4i/1Z/1j2gJVVyswkrIVUwZIDJtfAKzZI5iHx2gH8Y=
-  - secure: SsKJoJwtDVWrL5xxl9C/gTRy6FhfRQQNNAFOogl9mTs/WeI2t9QTYoKsxLPXOdoRdu4MvT3h/B2sjwggt7zP81fBVxQRTkg4nq0zSHlj0NqclbFa6I5lUYdGwH9gPk/HWJJwXhKRDsqn/iRw2v+qBDs/j3kIgPQ0yjM58LEPXic=
-
-matrix:
-  include:
-    - python: 3.6
-      env: TOXENV=lint
-    - python: 3.7
-      env: TOXENV=py37
-      dist: xenial
-      sudo: true
-    - python: 3.6
-      env: TOXENV=py36
-    - python: 3.5
-      env: TOXENV=py35
-    - python: pypy3
-      env: TOXENV=pypy3
-    - python: 3.8-dev
-      env: TOXENV=py38dev
-      dist: xenial
-  allow_failures:
-    - env: TOXENV=pypy3
-  fast_finish: true
-
-install:
-- travis_retry pip install tox
-- travis_retry pip install coverage
-
-script: tox
-
-after_success:
-- travis_retry pip install coveralls && coveralls
-- travis_retry pip install codecov && codecov
-- travis_retry pip install scrutinizer-ocular && ocular
-

CHANGELOG.md

@@ -1,29 +1,159 @@
 # Changelog
 
-All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+## 4.2.1 and newer
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+See GitHub Releases:
+
+- https://github.com/pylast/pylast/releases
+
+## [4.2.0] - 2021-03-14
+
+## Changed
+
+- Fix unsafe creation of temp file for caching, and improve exception raising (#356)
+  @kvanzuijlen
+- [pre-commit.ci] pre-commit autoupdate (#362) @pre-commit-ci
+
+## [4.1.0] - 2021-01-04
+
+## Added
+
+- Add support for streaming (#336) @kvanzuijlen
+- Add Python 3.9 final to Travis CI (#350) @sheetalsingala
+
+## Changed
+
+- Update copyright year (#360) @hugovk
+- Replace Travis CI with GitHub Actions (#352) @hugovk
+- [pre-commit.ci] pre-commit autoupdate (#359) @pre-commit-ci
+
+## Fixed
+
+- Set limit to 50 by default, not 1 (#355) @hugovk
+
+## [4.0.0] - 2020-10-07
+
+## Added
+
+- Add support for Python 3.9 (#347) @hugovk
+
+## Removed
+
+- Remove deprecated `Artist.get_cover_image`, `User.get_artist_tracks` and
+  `STATUS_TOKEN_ERROR` (#348) @hugovk
+- Drop support for EOL Python 3.5 (#346) @hugovk
+
+## [3.3.0] - 2020-06-25
 
-## [Unreleased]
 ### Added
-* This changelog file ([#273])
+
+- `User.get_now_playing`: Add album and cover image to info (#330) @hugovk
+
+### Changed
+
+- Improve handling of error responses from the API (#327) @spiritualized
+
+### Deprecated
+
+- Deprecate `Artist.get_cover_image`, they're no longer available from Last.fm (#332)
+  @hugovk
+
+### Fixed
+
+- Fix `artist.get_bio_content()` to return `None` if bio is empty (#326) @hugovk
+
+## [3.2.1] - 2020-03-05
+
+### Fixed
+
+- Only Python 3 is supported: don't create universal wheel (#318) @hugovk
+- Fix regression calling `get_recent_tracks` with `limit=None` (#320) @hugovk
+- Fix `DeprecationWarning`: Please use `assertRegex` instead (#323) @hugovk
+
+## [3.2.0] - 2020-01-03
+
+### Added
+
+- Support for Python 3.8
+- Store album art URLs when you call `GetTopAlbums` ([#307])
+- Retry paging through results on exception ([#297])
+- More error status codes from https://last.fm/api/errorcodes ([#297])
+
+### Changed
+
+- Respect `get_recent_tracks`' limit when there's a now playing track ([#310])
+- Move installable code to `src/` ([#301])
+- Update `get_weekly_artist_charts` docstring: only for `User` ([#311])
+- Remove Python 2 warnings, `python_requires` should be enough ([#312])
+- Use setuptools_scm to simplify versioning during release ([#316])
+- Various lint and test updates
+
+### Deprecated
+
+- Last.fm's `user.getArtistTracks` has now been deprecated by Last.fm and is no longer
+  available. Last.fm returns a "Deprecated - This type of request is no longer
+  supported" error when calling it. A future version of pylast will remove its
+  `User.get_artist_tracks` altogether. ([#305])
+
+- `STATUS_TOKEN_ERROR` is deprecated and will be removed in a future version. Use
+  `STATUS_OPERATION_FAILED` instead.
+
+## [3.1.0] - 2019-03-07
+
+### Added
+
+- Extract username from session via new
+  `SessionKeyGenerator.get_web_auth_session_key_username` ([#290])
+- `User.get_track_scrobbles` ([#298])
+
+### Deprecated
+
+- `User.get_artist_tracks`. Use `User.get_track_scrobbles` as a partial replacement.
+  ([#298])
+
+## [3.0.0] - 2019-01-01
+
+### Added
+
+- This changelog file ([#273])
 
 ### Removed
 
-* Support for Python 2.7 ([#265])
+- Support for Python 2.7 ([#265])
 
-* Constants `COVER_SMALL`, `COVER_MEDIUM`, `COVER_LARGE`, `COVER_EXTRA_LARGE`
+- Constants `COVER_SMALL`, `COVER_MEDIUM`, `COVER_LARGE`, `COVER_EXTRA_LARGE` and
-  and `COVER_MEGA`. Use `SIZE_SMALL` etc. instead. ([#282])
+  `COVER_MEGA`. Use `SIZE_SMALL` etc. instead. ([#282])
 
 ## [2.4.0] - 2018-08-08
+
 ### Deprecated
 
-* Support for Python 2.7 ([#265])
+- Support for Python 2.7 ([#265])
 
-
+[4.2.0]: https://github.com/pylast/pylast/compare/4.1.0...4.2.0
-[Unreleased]: https://github.com/pylast/pylast/compare/v2.4.0...HEAD
+[4.1.0]: https://github.com/pylast/pylast/compare/4.0.0...4.1.0
+[4.0.0]: https://github.com/pylast/pylast/compare/3.3.0...4.0.0
+[3.3.0]: https://github.com/pylast/pylast/compare/3.2.1...3.3.0
+[3.2.1]: https://github.com/pylast/pylast/compare/3.2.0...3.2.1
+[3.2.0]: https://github.com/pylast/pylast/compare/3.1.0...3.2.0
+[3.1.0]: https://github.com/pylast/pylast/compare/3.0.0...3.1.0
+[3.0.0]: https://github.com/pylast/pylast/compare/2.4.0...3.0.0
 [2.4.0]: https://github.com/pylast/pylast/compare/2.3.0...2.4.0
 [#265]: https://github.com/pylast/pylast/issues/265
 [#273]: https://github.com/pylast/pylast/issues/273
 [#282]: https://github.com/pylast/pylast/pull/282
+[#290]: https://github.com/pylast/pylast/pull/290
+[#297]: https://github.com/pylast/pylast/issues/297
+[#298]: https://github.com/pylast/pylast/issues/298
+[#301]: https://github.com/pylast/pylast/issues/301
+[#305]: https://github.com/pylast/pylast/issues/305
+[#307]: https://github.com/pylast/pylast/issues/307
+[#310]: https://github.com/pylast/pylast/issues/310
+[#311]: https://github.com/pylast/pylast/issues/311
+[#312]: https://github.com/pylast/pylast/issues/312
+[#316]: https://github.com/pylast/pylast/issues/316
+[#346]: https://github.com/pylast/pylast/issues/346
+[#347]: https://github.com/pylast/pylast/issues/347
+[#348]: https://github.com/pylast/pylast/issues/348

INSTALL

@@ -1,4 +0,0 @@
-Installation Instructions
-=========================
-
-Execute "python setup.py install" as a super user.

MANIFEST.in

@@ -1,6 +0,0 @@
-include pylast/*.py
-include setup.py
-include README.md
-include COPYING
-include INSTALL
-recursive-include tests *.py

README.md

@@ -1,59 +1,65 @@
-pyLast
+# pyLast
-======
 
 [![PyPI version](https://img.shields.io/pypi/v/pylast.svg)](https://pypi.org/project/pylast/)
 [![Supported Python versions](https://img.shields.io/pypi/pyversions/pylast.svg)](https://pypi.org/project/pylast/)
-[![Build status](https://travis-ci.org/pylast/pylast.svg?branch=master)](https://travis-ci.org/pylast/pylast)
+[![PyPI downloads](https://img.shields.io/pypi/dm/pylast.svg)](https://pypistats.org/packages/pylast)
-[![Coverage (Codecov)](https://codecov.io/gh/pylast/pylast/branch/master/graph/badge.svg)](https://codecov.io/gh/pylast/pylast)
+[![Test](https://github.com/pylast/pylast/workflows/Test/badge.svg)](https://github.com/pylast/pylast/actions)
-[![Coverage (Coveralls)](https://coveralls.io/repos/github/pylast/pylast/badge.svg?branch=master)](https://coveralls.io/github/pylast/pylast?branch=master)
+[![Coverage (Codecov)](https://codecov.io/gh/pylast/pylast/branch/main/graph/badge.svg)](https://codecov.io/gh/pylast/pylast)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
+[![Code style: Black](https://img.shields.io/badge/code%20style-Black-000000.svg)](https://github.com/psf/black)
+[![DOI](https://zenodo.org/badge/7803088.svg)](https://zenodo.org/badge/latestdoi/7803088)
 
-A Python interface to [Last.fm](https://www.last.fm/) and other API-compatible websites such as [Libre.fm](https://libre.fm/).
+A Python interface to [Last.fm](https://www.last.fm/) and other API-compatible websites
+such as [Libre.fm](https://libre.fm/).
 
 Use the pydoc utility for help on usage or see [tests/](tests/) for examples.
 
-Installation
+## Installation
-------------
-
-Install via pip:
-
-    pip install pylast
 
 Install latest development version:
 
-    pip install -U git+https://github.com/pylast/pylast
+```sh
+python3 -m pip install -U git+https://git.hirad.it/Hirad/pylast
+```
 
 Or from requirements.txt:
 
-    -e git://github.com/pylast/pylast.git#egg=pylast
+```txt
+-e https://git.hirad.it/Hirad/pylast#egg=pylast
+```
 
 Note:
 
-* pylast 3.0.0+ supports Python 3.5+ ([#265](https://github.com/pylast/pylast/issues/265))
+- pyLast 5.3+ supports Python 3.8-3.13.
-* pyLast 2.2.0 - 2.4.0 supports Python 2.7.10+, 3.4, 3.5, 3.6, 3.7.
+- pyLast 5.2+ supports Python 3.8-3.12.
-* pyLast 2.0.0 - 2.1.0 supports Python 2.7.10+, 3.4, 3.5, 3.6.
+- pyLast 5.1 supports Python 3.7-3.11.
-* pyLast 1.7.0 - 1.9.0 supports Python 2.7, 3.3, 3.4, 3.5, 3.6.
+- pyLast 5.0 supports Python 3.7-3.10.
-* pyLast 1.0.0 - 1.6.0 supports Python 2.7, 3.3, 3.4.
+- pyLast 4.3 - 4.5 supports Python 3.6-3.10.
-* pyLast 0.5 supports Python 2, 3.
+- pyLast 4.0 - 4.2 supports Python 3.6-3.9.
-* pyLast < 0.5 supports Python 2.
+- pyLast 3.2 - 3.3 supports Python 3.5-3.8.
+- pyLast 3.0 - 3.1 supports Python 3.5-3.7.
+- pyLast 2.2 - 2.4 supports Python 2.7.10+, 3.4-3.7.
+- pyLast 2.0 - 2.1 supports Python 2.7.10+, 3.4-3.6.
+- pyLast 1.7 - 1.9 supports Python 2.7, 3.3-3.6.
+- pyLast 1.0 - 1.6 supports Python 2.7, 3.3-3.4.
+- pyLast 0.5 supports Python 2, 3.
+- pyLast < 0.5 supports Python 2.
 
-Features
+## Features
---------
 
- * Simple public interface.
+- Simple public interface.
- * Access to all the data exposed by the Last.fm web services.
+- Access to all the data exposed by the Last.fm web services.
- * Scrobbling support.
+- Scrobbling support.
- * Full object-oriented design.
+- Full object-oriented design.
- * Proxy support.
+- Proxy support.
- * Internal caching support for some web services calls (disabled by default).
+- Internal caching support for some web services calls (disabled by default).
- * Support for other API-compatible networks like Libre.fm.
+- Support for other API-compatible networks like Libre.fm.
- * Python 3-friendly (Starting from 0.5).
 
+## Getting started
 
-Getting started
+Here's some simple code example to get you started. In order to create any object from
----------------
+pyLast, you need a `Network` object which represents a social music network that is
-
+Last.fm or any other API-compatible one. You can obtain a pre-configured one for Last.fm
-Here's some simple code example to get you started. In order to create any object from pyLast, you need a `Network` object which represents a social music network that is Last.fm or any other API-compatible one. You can obtain a pre-configured one for Last.fm and use it as follows:
+and use it as follows:
 
 ```python
 import pylast
@@ -67,14 +73,50 @@ API_SECRET = "425b55975eed76058ac220b7b4e8a054"
 username = "your_user_name"
 password_hash = pylast.md5("your_password")
 
-network = pylast.LastFMNetwork(api_key=API_KEY, api_secret=API_SECRET,
+network = pylast.LastFMNetwork(
-                               username=username, password_hash=password_hash)
+    api_key=API_KEY,
+    api_secret=API_SECRET,
+    username=username,
+    password_hash=password_hash,
+)
+```
 
+Alternatively, instead of creating `network` with a username and password, you can
+authenticate with a session key:
+
+```python
+import pylast
+
+SESSION_KEY_FILE = os.path.join(os.path.expanduser("~"), ".session_key")
+network = pylast.LastFMNetwork(API_KEY, API_SECRET)
+if not os.path.exists(SESSION_KEY_FILE):
+    skg = pylast.SessionKeyGenerator(network)
+    url = skg.get_web_auth_url()
+
+    print(f"Please authorize this script to access your account: {url}\n")
+    import time
+    import webbrowser
+
+    webbrowser.open(url)
+
+    while True:
+        try:
+            session_key = skg.get_web_auth_session_key(url)
+            with open(SESSION_KEY_FILE, "w") as f:
+                f.write(session_key)
+            break
+        except pylast.WSError:
+            time.sleep(1)
+else:
+    session_key = open(SESSION_KEY_FILE).read()
+
+network.session_key = session_key
+```
+
+And away we go:
+
+```python
 # Now you can use that object everywhere
-artist = network.get_artist("System of a Down")
-artist.shout("<3")
-
-
 track = network.get_track("Iron Maiden", "The Nomad")
 track.love()
 track.add_tags(("awesome", "favorite"))
@@ -83,14 +125,20 @@ track.add_tags(("awesome", "favorite"))
 # to get more help about anything and see examples of how it works
 ```
 
-More examples in <a href="https://github.com/hugovk/lastfm-tools">hugovk/lastfm-tools</a> and [tests/](tests/).
+More examples in
+<a href="https://github.com/hugovk/lastfm-tools">hugovk/lastfm-tools</a> and
+[tests/](https://github.com/pylast/pylast/tree/main/tests).
 
-Testing
+## Testing
--------
 
-The [tests/](tests/) directory contains integration and unit tests with Last.fm, and plenty of code examples.
+The [tests/](https://github.com/pylast/pylast/tree/main/tests) directory contains
+integration and unit tests with Last.fm, and plenty of code examples.
 
-For integration tests you need a test account at Last.fm that will become cluttered with test data, and an API key and secret. Either copy [example_test_pylast.yaml](example_test_pylast.yaml) to test_pylast.yaml and fill out the credentials, or set them as environment variables like:
+For integration tests you need a test account at Last.fm that will become cluttered with
+test data, and an API key and secret. Either copy
+[example_test_pylast.yaml](https://github.com/pylast/pylast/blob/main/example_test_pylast.yaml)
+to test_pylast.yaml and fill out the credentials, or set them as environment variables
+like:
 
 ```sh
 export PYLAST_USERNAME=TODO_ENTER_YOURS_HERE
@@ -100,17 +148,20 @@ export PYLAST_API_SECRET=TODO_ENTER_YOURS_HERE
 ```
 
 To run all unit and integration tests:
+
 ```sh
-pip install pytest flaky mock
+python3 -m pip install -e ".[tests]"
 pytest
 ```
 
 Or run just one test case:
+
 ```sh
 pytest -k test_scrobble
 ```
 
 To run with coverage:
+
 ```sh
 pytest -v --cov pylast --cov-report term-missing
 coverage report # for command-line report
@@ -118,8 +169,7 @@ coverage html   # for HTML report
 open htmlcov/index.html
 ```
 
-Logging
+## Logging
--------
 
 To enable from your own code:
 
@@ -127,7 +177,8 @@ To enable from your own code:
 import logging
 import pylast
 
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.INFO)
+
 
 network = pylast.LastFMNetwork(...)
 ```
@@ -135,5 +186,8 @@ network = pylast.LastFMNetwork(...)
 To enable from pytest:
 
 ```sh
-pytest --log-cli-level debug -k test_album_search_images
+pytest --log-cli-level info -k test_album_search_images
 ```
+
+To also see data returned from the API, use `level=logging.DEBUG` or
+`--log-cli-level debug` instead.

RELEASING.md

@@ -1,41 +1,23 @@
 # Release Checklist
 
-* [ ] Get master to the appropriate code release state. [Travis CI](https://travis-ci.org/pylast/pylast) should be running cleanly for all merges to master.
+- [ ] Get `main` to the appropriate code release state.
-* [ ] Remove `.dev0` suffix from the version:
+      [GitHub Actions](https://github.com/pylast/pylast/actions) should be running
+      cleanly for all merges to `main`.
+      [![Test](https://github.com/pylast/pylast/workflows/Test/badge.svg)](https://github.com/pylast/pylast/actions)
+
+- [ ] Edit release draft, adjust text if needed:
+      https://github.com/pylast/pylast/releases
+
+- [ ] Check next tag is correct, amend if needed
+
+- [ ] Publish release
+
+- [ ] Check the tagged
+      [GitHub Actions build](https://github.com/pylast/pylast/actions/workflows/deploy.yml)
+      has deployed to [PyPI](https://pypi.org/project/pylast/#history)
+
+- [ ] Check installation:
+
 ```bash
-git checkout master
+pip3 uninstall -y pylast && pip3 install -U pylast && python3 -c "import pylast; print(pylast.__version__)"
-edit pylast/version.py
-```
-* [ ] Commit and tag with the version number:
-```bash
-git add pylast/version.py
-git commit -m "Release 2.1.0"
-git tag -a 2.1.0 -m "Release 2.1.0"
-```
-* [ ] Create a distribution and release on PyPI:
-```bash
-pip install -U pip setuptools wheel twine keyring
-rm -rf build
-python setup.py sdist --format=gztar bdist_wheel
-twine upload -r pypi dist/pylast-2.1.0*
-```
-* [ ] Check installation: `pip install -U pylast`
-* [ ] Push commits and tags:
- ```bash
-git push
-git push --tags
-```
-* [ ] Create new GitHub release: https://github.com/pylast/pylast/releases/new
-  * Tag: Pick existing tag "2.1.0"
-  * Title: "Release 2.1.0"
-* [ ] Increment version and append `.dev0`:
-```bash
-git checkout master
-edit pylast/version.py
-```
-* [ ] Commit and push:
-```bash
-git add pylast/version.py
-git commit -m "Start new release cycle"
-git push
 ```

pylast/version.py

@@ -1,2 +0,0 @@
-# Master version for pylast
-__version__ = "3.0.0"

pyproject.toml

@@ -0,0 +1,97 @@
+[build-system]
+build-backend = "hatchling.build"
+requires = [
+  "hatch-vcs",
+  "hatchling",
+]
+
+[project]
+name = "pylast"
+description = "A Python interface to Last.fm and Libre.fm"
+readme = "README.md"
+keywords = [
+  "Last.fm",
+  "music",
+  "scrobble",
+  "scrobbling",
+]
+license = { text = "Apache-2.0" }
+maintainers = [
+  { name = "Hugo van Kemenade" },
+]
+authors = [
+  { name = "Amr Hassan <amr.hassan@gmail.com> and Contributors", email = "amr.hassan@gmail.com" },
+]
+requires-python = ">=3.8"
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "License :: OSI Approved :: Apache Software License",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+  "Topic :: Internet",
+  "Topic :: Multimedia :: Sound/Audio",
+  "Topic :: Software Development :: Libraries :: Python Modules",
+]
+dynamic = [
+  "version",
+]
+dependencies = [
+  "httpx",
+]
+optional-dependencies.tests = [
+  "flaky",
+  "pytest",
+  "pytest-cov",
+  "pytest-random-order",
+  "pyyaml",
+]
+urls.Changelog = "https://github.com/pylast/pylast/releases"
+urls.Homepage = "https://github.com/pylast/pylast"
+urls.Source = "https://github.com/pylast/pylast"
+
+[tool.hatch]
+version.source = "vcs"
+
+[tool.hatch.version.raw-options]
+local_scheme = "no-local-version"
+
+[tool.ruff]
+fix = true
+
+lint.select = [
+  "C4",     # flake8-comprehensions
+  "E",      # pycodestyle errors
+  "EM",     # flake8-errmsg
+  "F",      # pyflakes errors
+  "I",      # isort
+  "ISC",    # flake8-implicit-str-concat
+  "LOG",    # flake8-logging
+  "PGH",    # pygrep-hooks
+  "RUF022", # unsorted-dunder-all
+  "RUF100", # unused noqa (yesqa)
+  "UP",     # pyupgrade
+  "W",      # pycodestyle warnings
+  "YTT",    # flake8-2020
+]
+lint.extend-ignore = [
+  "E203", # Whitespace before ':'
+  "E221", # Multiple spaces before operator
+  "E226", # Missing whitespace around arithmetic operator
+  "E241", # Multiple spaces after ','
+]
+lint.isort.known-first-party = [
+  "pylast",
+]
+lint.isort.required-imports = [
+  "from __future__ import annotations",
+]
+
+[tool.pyproject-fmt]
+max_supported_python = "3.13"

pytest.ini

@@ -2,3 +2,5 @@
 filterwarnings =
     once::DeprecationWarning
     once::PendingDeprecationWarning
+
+xfail_strict=true

setup.cfg

@@ -1,11 +0,0 @@
-[bdist_wheel]
-universal = 1
-
-[flake8]
-max_line_length = 88
-
-[metadata]
-license_file = COPYING
-
-[pycodestyle]
-max_line_length = 88

setup.py

@@ -1,80 +0,0 @@
-#!/usr/bin/env python
-from __future__ import print_function
-import sys
-
-from setuptools import find_packages, setup
-
-version_dict = {}
-with open("pylast/version.py") as f:
-    exec(f.read(), version_dict)
-    version = version_dict["__version__"]
-
-
-if sys.version_info < (3, 5):
-    error = """pylast 3.0 and above are no longer compatible with Python 2.
-
-This is pylast {} and you are using Python {}.
-Make sure you have pip >= 9.0 and setuptools >= 24.2 and retry:
-
- $ pip install --upgrade pip setuptools
-
-Other choices:
-
-- Upgrade to Python 3.
-
-- Install an older version of pylast:
-
-$ pip install 'pylast<3.0'
-
-For more information:
-
-https://github.com/pylast/pylast/issues/265
-""".format(
-        version, ".".join([str(v) for v in sys.version_info[:3]])
-    )
-    print(error, file=sys.stderr)
-    sys.exit(1)
-
-with open("README.md") as f:
-    long_description = f.read()
-
-
-setup(
-    name="pylast",
-    description="A Python interface to Last.fm and Libre.fm",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    version=version,
-    author="Amr Hassan <amr.hassan@gmail.com> and Contributors",
-    author_email="amr.hassan@gmail.com",
-    url="https://github.com/pylast/pylast",
-    tests_require=[
-        "coverage",
-        "flaky",
-        "mock",
-        "pycodestyle",
-        "pyflakes",
-        "pytest",
-        "pyyaml",
-    ],
-    python_requires=">=3.5",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "License :: OSI Approved :: Apache Software License",
-        "Topic :: Internet",
-        "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 :: Only",
-        "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: Implementation :: PyPy",
-    ],
-    keywords=["Last.fm", "music", "scrobble", "scrobbling"],
-    packages=find_packages(exclude=("tests*",)),
-    license="Apache2",
-)
-
-# End of file

tests/test_album.py

@@ -2,7 +2,7 @@
 """
 Integration (not unit) tests for pylast.py
 """
-import unittest
+from __future__ import annotations
 
 import pylast
 
@@ -10,46 +10,36 @@ from .test_pylast import TestPyLastWithLastFm
 
 
 class TestPyLastAlbum(TestPyLastWithLastFm):
-    def test_album_tags_are_topitems(self):
+    def test_album_tags_are_topitems(self) -> None:
         # Arrange
-        albums = self.network.get_user("RJ").get_top_albums()
+        album = self.network.get_album("Test Artist", "Test Album")
 
         # Act
-        tags = albums[0].item.get_top_tags(limit=1)
+        tags = album.get_top_tags(limit=1)
 
         # Assert
-        self.assertGreater(len(tags), 0)
+        assert len(tags) > 0
-        self.assertIsInstance(tags[0], pylast.TopItem)
+        assert isinstance(tags[0], pylast.TopItem)
 
-    def test_album_is_hashable(self):
+    def test_album_is_hashable(self) -> None:
         # Arrange
         album = self.network.get_album("Test Artist", "Test Album")
 
         # Act/Assert
         self.helper_is_thing_hashable(album)
 
-    def test_album_in_recent_tracks(self):
+    def test_album_in_recent_tracks(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user(self.username)
 
         # Act
         # limit=2 to ignore now-playing:
-        track = lastfm_user.get_recent_tracks(limit=2)[0]
+        track = list(lastfm_user.get_recent_tracks(limit=2))[0]
 
         # Assert
-        self.assertTrue(hasattr(track, "album"))
+        assert hasattr(track, "album")
 
-    def test_album_in_artist_tracks(self):
+    def test_album_wiki_content(self) -> None:
-        # Arrange
-        lastfm_user = self.network.get_user(self.username)
-
-        # Act
-        track = lastfm_user.get_artist_tracks(artist="Test Artist")[0]
-
-        # Assert
-        self.assertTrue(hasattr(track, "album"))
-
-    def test_album_wiki_content(self):
         # Arrange
         album = pylast.Album("Test Artist", "Test Album", self.network)
 
@@ -57,10 +47,10 @@ class TestPyLastAlbum(TestPyLastWithLastFm):
         wiki = album.get_wiki_content()
 
         # Assert
-        self.assertIsNotNone(wiki)
+        assert wiki is not None
-        self.assertGreaterEqual(len(wiki), 1)
+        assert len(wiki) >= 1
 
-    def test_album_wiki_published_date(self):
+    def test_album_wiki_published_date(self) -> None:
         # Arrange
         album = pylast.Album("Test Artist", "Test Album", self.network)
 
@@ -68,10 +58,10 @@ class TestPyLastAlbum(TestPyLastWithLastFm):
         wiki = album.get_wiki_published_date()
 
         # Assert
-        self.assertIsNotNone(wiki)
+        assert wiki is not None
-        self.assertGreaterEqual(len(wiki), 1)
+        assert len(wiki) >= 1
 
-    def test_album_wiki_summary(self):
+    def test_album_wiki_summary(self) -> None:
         # Arrange
         album = pylast.Album("Test Artist", "Test Album", self.network)
 
@@ -79,26 +69,26 @@ class TestPyLastAlbum(TestPyLastWithLastFm):
         wiki = album.get_wiki_summary()
 
         # Assert
-        self.assertIsNotNone(wiki)
+        assert wiki is not None
-        self.assertGreaterEqual(len(wiki), 1)
+        assert len(wiki) >= 1
 
-    def test_album_eq_none_is_false(self):
+    def test_album_eq_none_is_false(self) -> None:
         # Arrange
         album1 = None
         album2 = pylast.Album("Test Artist", "Test Album", self.network)
 
         # Act / Assert
-        self.assertNotEqual(album1, album2)
+        assert album1 != album2
 
-    def test_album_ne_none_is_true(self):
+    def test_album_ne_none_is_true(self) -> None:
         # Arrange
         album1 = None
         album2 = pylast.Album("Test Artist", "Test Album", self.network)
 
         # Act / Assert
-        self.assertNotEqual(album1, album2)
+        assert album1 != album2
 
-    def test_get_cover_image(self):
+    def test_get_cover_image(self) -> None:
         # Arrange
         album = self.network.get_album("Test Artist", "Test Album")
 
@@ -106,9 +96,25 @@ class TestPyLastAlbum(TestPyLastWithLastFm):
         image = album.get_cover_image()
 
         # Assert
-        self.assert_startswith(image, "https://")
+        assert image.startswith("https://")
-        self.assert_endswith(image, ".png")
+        assert image.endswith(".gif") or image.endswith(".png")
 
+    def test_mbid(self) -> None:
+        # Arrange
+        album = self.network.get_album("Radiohead", "OK Computer")
 
-if __name__ == "__main__":
+        # Act
-    unittest.main(failfast=True)
+        mbid = album.get_mbid()
+
+        # Assert
+        assert mbid == "0b6b4ba0-d36f-47bd-b4ea-6a5b91842d29"
+
+    def test_no_mbid(self) -> None:
+        # Arrange
+        album = self.network.get_album("Test Artist", "Test Album")
+
+        # Act
+        mbid = album.get_mbid()
+
+        # Assert
+        assert mbid is None

tests/test_artist.py

@@ -2,15 +2,17 @@
 """
 Integration (not unit) tests for pylast.py
 """
-import unittest
+from __future__ import annotations
+
+import pytest
 
 import pylast
 
-from .test_pylast import TestPyLastWithLastFm
+from .test_pylast import WRITE_TEST, TestPyLastWithLastFm
 
 
 class TestPyLastArtist(TestPyLastWithLastFm):
-    def test_repr(self):
+    def test_repr(self) -> None:
         # Arrange
         artist = pylast.Artist("Test Artist", self.network)
 
@@ -18,18 +20,18 @@ class TestPyLastArtist(TestPyLastWithLastFm):
         representation = repr(artist)
 
         # Assert
-        self.assertTrue(representation.startswith("pylast.Artist('Test Artist',"))
+        assert representation.startswith("pylast.Artist('Test Artist',")
 
-    def test_artist_is_hashable(self):
+    def test_artist_is_hashable(self) -> None:
         # Arrange
-        test_artist = self.network.get_artist("Test Artist")
+        test_artist = self.network.get_artist("Radiohead")
         artist = test_artist.get_similar(limit=2)[0].item
-        self.assertIsInstance(artist, pylast.Artist)
+        assert isinstance(artist, pylast.Artist)
 
         # Act/Assert
         self.helper_is_thing_hashable(artist)
 
-    def test_bio_published_date(self):
+    def test_bio_published_date(self) -> None:
         # Arrange
         artist = pylast.Artist("Test Artist", self.network)
 
@@ -37,10 +39,10 @@ class TestPyLastArtist(TestPyLastWithLastFm):
         bio = artist.get_bio_published_date()
 
         # Assert
-        self.assertIsNotNone(bio)
+        assert bio is not None
-        self.assertGreaterEqual(len(bio), 1)
+        assert len(bio) >= 1
 
-    def test_bio_content(self):
+    def test_bio_content(self) -> None:
         # Arrange
         artist = pylast.Artist("Test Artist", self.network)
 
@@ -48,10 +50,21 @@ class TestPyLastArtist(TestPyLastWithLastFm):
         bio = artist.get_bio_content(language="en")
 
         # Assert
-        self.assertIsNotNone(bio)
+        assert bio is not None
-        self.assertGreaterEqual(len(bio), 1)
+        assert len(bio) >= 1
 
-    def test_bio_summary(self):
+    def test_bio_content_none(self) -> None:
+        # Arrange
+        # An artist with no biography, with "<content/>" in the API XML
+        artist = pylast.Artist("Mr Sizef + Unquote", self.network)
+
+        # Act
+        bio = artist.get_bio_content()
+
+        # Assert
+        assert bio is None
+
+    def test_bio_summary(self) -> None:
         # Arrange
         artist = pylast.Artist("Test Artist", self.network)
 
@@ -59,10 +72,10 @@ class TestPyLastArtist(TestPyLastWithLastFm):
         bio = artist.get_bio_summary(language="en")
 
         # Assert
-        self.assertIsNotNone(bio)
+        assert bio is not None
-        self.assertGreaterEqual(len(bio), 1)
+        assert len(bio) >= 1
 
-    def test_artist_top_tracks(self):
+    def test_artist_top_tracks(self) -> None:
         # Arrange
         # Pick an artist with plenty of plays
         artist = self.network.get_top_artists(limit=1)[0].item
@@ -73,54 +86,41 @@ class TestPyLastArtist(TestPyLastWithLastFm):
         # Assert
         self.helper_two_different_things_in_top_list(things, pylast.Track)
 
-    def test_artist_top_albums(self):
+    def test_artist_top_albums(self) -> None:
         # Arrange
         # Pick an artist with plenty of plays
         artist = self.network.get_top_artists(limit=1)[0].item
 
         # Act
-        things = artist.get_top_albums(limit=2)
+        things = list(artist.get_top_albums(limit=2))
 
         # Assert
         self.helper_two_different_things_in_top_list(things, pylast.Album)
 
-    def test_artist_top_albums_limit_1(self):
+    @pytest.mark.parametrize("test_limit", [1, 50, 100])
+    def test_artist_top_albums_limit(self, test_limit: int) -> None:
         # Arrange
-        limit = 1
         # Pick an artist with plenty of plays
         artist = self.network.get_top_artists(limit=1)[0].item
 
         # Act
-        things = artist.get_top_albums(limit=limit)
+        things = artist.get_top_albums(limit=test_limit)
 
         # Assert
-        self.assertEqual(len(things), 1)
+        assert len(things) == test_limit
 
-    def test_artist_top_albums_limit_50(self):
+    def test_artist_top_albums_limit_default(self) -> None:
         # Arrange
-        limit = 50
         # Pick an artist with plenty of plays
         artist = self.network.get_top_artists(limit=1)[0].item
 
         # Act
-        things = artist.get_top_albums(limit=limit)
+        things = artist.get_top_albums()
 
         # Assert
-        self.assertEqual(len(things), 50)
+        assert len(things) == 50
 
-    def test_artist_top_albums_limit_100(self):
+    def test_artist_listener_count(self) -> None:
-        # Arrange
-        limit = 100
-        # Pick an artist with plenty of plays
-        artist = self.network.get_top_artists(limit=1)[0].item
-
-        # Act
-        things = artist.get_top_albums(limit=limit)
-
-        # Assert
-        self.assertEqual(len(things), 100)
-
-    def test_artist_listener_count(self):
         # Arrange
         artist = self.network.get_artist("Test Artist")
 
@@ -128,10 +128,11 @@ class TestPyLastArtist(TestPyLastWithLastFm):
         count = artist.get_listener_count()
 
         # Assert
-        self.assertIsInstance(count, int)
+        assert isinstance(count, int)
-        self.assertGreater(count, 0)
+        assert count > 0
 
-    def test_tag_artist(self):
+    @pytest.mark.skipif(not WRITE_TEST, reason="Only test once to avoid collisions")
+    def test_tag_artist(self) -> None:
         # Arrange
         artist = self.network.get_artist("Test Artist")
         # artist.clear_tags()
@@ -141,15 +142,12 @@ class TestPyLastArtist(TestPyLastWithLastFm):
 
         # Assert
         tags = artist.get_tags()
-        self.assertGreater(len(tags), 0)
+        assert len(tags) > 0
-        found = False
+        found = any(tag.name == "testing" for tag in tags)
-        for tag in tags:
+        assert found
-            if tag.name == "testing":
-                found = True
-                break
-        self.assertTrue(found)
 
-    def test_remove_tag_of_type_text(self):
+    @pytest.mark.skipif(not WRITE_TEST, reason="Only test once to avoid collisions")
+    def test_remove_tag_of_type_text(self) -> None:
         # Arrange
         tag = "testing"  # text
         artist = self.network.get_artist("Test Artist")
@@ -160,14 +158,11 @@ class TestPyLastArtist(TestPyLastWithLastFm):
 
         # Assert
         tags = artist.get_tags()
-        found = False
+        found = any(tag.name == "testing" for tag in tags)
-        for tag in tags:
+        assert not found
-            if tag.name == "testing":
-                found = True
-                break
-        self.assertFalse(found)
 
-    def test_remove_tag_of_type_tag(self):
+    @pytest.mark.skipif(not WRITE_TEST, reason="Only test once to avoid collisions")
+    def test_remove_tag_of_type_tag(self) -> None:
         # Arrange
         tag = pylast.Tag("testing", self.network)  # Tag
         artist = self.network.get_artist("Test Artist")
@@ -178,14 +173,11 @@ class TestPyLastArtist(TestPyLastWithLastFm):
 
         # Assert
         tags = artist.get_tags()
-        found = False
+        found = any(tag.name == "testing" for tag in tags)
-        for tag in tags:
+        assert not found
-            if tag.name == "testing":
-                found = True
-                break
-        self.assertFalse(found)
 
-    def test_remove_tags(self):
+    @pytest.mark.skipif(not WRITE_TEST, reason="Only test once to avoid collisions")
+    def test_remove_tags(self) -> None:
         # Arrange
         tags = ["removetag1", "removetag2"]
         artist = self.network.get_artist("Test Artist")
@@ -198,17 +190,14 @@ class TestPyLastArtist(TestPyLastWithLastFm):
 
         # Assert
         tags_after = artist.get_tags()
-        self.assertEqual(len(tags_after), len(tags_before) - 2)
+        assert len(tags_after) == len(tags_before) - 2
-        found1, found2 = False, False
+        found1 = any(tag.name == "removetag1" for tag in tags_after)
-        for tag in tags_after:
+        found2 = any(tag.name == "removetag2" for tag in tags_after)
-            if tag.name == "removetag1":
+        assert not found1
-                found1 = True
+        assert not found2
-            elif tag.name == "removetag2":
-                found2 = True
-        self.assertFalse(found1)
-        self.assertFalse(found2)
 
-    def test_set_tags(self):
+    @pytest.mark.skipif(not WRITE_TEST, reason="Only test once to avoid collisions")
+    def test_set_tags(self) -> None:
         # Arrange
         tags = ["sometag1", "sometag2"]
         artist = self.network.get_artist("Test Artist 2")
@@ -221,18 +210,18 @@ class TestPyLastArtist(TestPyLastWithLastFm):
 
         # Assert
         tags_after = artist.get_tags()
-        self.assertNotEqual(tags_before, tags_after)
+        assert tags_before != tags_after
-        self.assertEqual(len(tags_after), 2)
+        assert len(tags_after) == 2
         found1, found2 = False, False
         for tag in tags_after:
             if tag.name == "settag1":
                 found1 = True
             elif tag.name == "settag2":
                 found2 = True
-        self.assertTrue(found1)
+        assert found1
-        self.assertTrue(found2)
+        assert found2
 
-    def test_artists(self):
+    def test_artists(self) -> None:
         # Arrange
         artist1 = self.network.get_artist("Radiohead")
         artist2 = self.network.get_artist("Portishead")
@@ -240,38 +229,35 @@ class TestPyLastArtist(TestPyLastWithLastFm):
         # Act
         url = artist1.get_url()
         mbid = artist1.get_mbid()
-        image = artist1.get_cover_image()
+
         playcount = artist1.get_playcount()
-        streamable = artist1.is_streamable()
         name = artist1.get_name(properly_capitalized=False)
         name_cap = artist1.get_name(properly_capitalized=True)
 
         # Assert
-        self.assertIn("https", image)
+        assert playcount > 1
-        self.assertGreater(playcount, 1)
+        assert artist1 != artist2
-        self.assertNotEqual(artist1, artist2)
+        assert name.lower() == name_cap.lower()
-        self.assertEqual(name.lower(), name_cap.lower())
+        assert url == "https://www.last.fm/music/radiohead"
-        self.assertEqual(url, "https://www.last.fm/music/radiohead")
+        assert mbid == "a74b1b7f-71a5-4011-9441-d0b5e4122711"
-        self.assertEqual(mbid, "a74b1b7f-71a5-4011-9441-d0b5e4122711")
-        self.assertIsInstance(streamable, bool)
 
-    def test_artist_eq_none_is_false(self):
+    def test_artist_eq_none_is_false(self) -> None:
         # Arrange
         artist1 = None
         artist2 = pylast.Artist("Test Artist", self.network)
 
         # Act / Assert
-        self.assertNotEqual(artist1, artist2)
+        assert artist1 != artist2
 
-    def test_artist_ne_none_is_true(self):
+    def test_artist_ne_none_is_true(self) -> None:
         # Arrange
         artist1 = None
         artist2 = pylast.Artist("Test Artist", self.network)
 
         # Act / Assert
-        self.assertNotEqual(artist1, artist2)
+        assert artist1 != artist2
 
-    def test_artist_get_correction(self):
+    def test_artist_get_correction(self) -> None:
         # Arrange
         artist = pylast.Artist("guns and roses", self.network)
 
@@ -279,9 +265,9 @@ class TestPyLastArtist(TestPyLastWithLastFm):
         corrected_artist_name = artist.get_correction()
 
         # Assert
-        self.assertEqual(corrected_artist_name, "Guns N' Roses")
+        assert corrected_artist_name == "Guns N' Roses"
 
-    def test_get_userplaycount(self):
+    def test_get_userplaycount(self) -> None:
         # Arrange
         artist = pylast.Artist("John Lennon", self.network, username=self.username)
 
@@ -289,8 +275,4 @@ class TestPyLastArtist(TestPyLastWithLastFm):
         playcount = artist.get_userplaycount()
 
         # Assert
-        self.assertGreaterEqual(playcount, 0)
+        assert playcount >= 0
-
-
-if __name__ == "__main__":
-    unittest.main(failfast=True)

tests/test_country.py

@@ -2,7 +2,7 @@
 """
 Integration (not unit) tests for pylast.py
 """
-import unittest
+from __future__ import annotations
 
 import pylast
 
@@ -10,14 +10,14 @@ from .test_pylast import TestPyLastWithLastFm
 
 
 class TestPyLastCountry(TestPyLastWithLastFm):
-    def test_country_is_hashable(self):
+    def test_country_is_hashable(self) -> None:
         # Arrange
         country = self.network.get_country("Italy")
 
         # Act/Assert
         self.helper_is_thing_hashable(country)
 
-    def test_countries(self):
+    def test_countries(self) -> None:
         # Arrange
         country1 = pylast.Country("Italy", self.network)
         country2 = pylast.Country("Finland", self.network)
@@ -28,13 +28,9 @@ class TestPyLastCountry(TestPyLastWithLastFm):
         url = country1.get_url()
 
         # Assert
-        self.assertIn("Italy", rep)
+        assert "Italy" in rep
-        self.assertIn("pylast.Country", rep)
+        assert "pylast.Country" in rep
-        self.assertEqual(text, "Italy")
+        assert text == "Italy"
-        self.assertEqual(country1, country1)
+        assert country1 == country1
-        self.assertNotEqual(country1, country2)
+        assert country1 != country2
-        self.assertEqual(url, "https://www.last.fm/place/italy")
+        assert url == "https://www.last.fm/place/italy"
-
-
-if __name__ == "__main__":
-    unittest.main(failfast=True)

tests/test_library.py

@@ -2,7 +2,7 @@
 """
 Integration (not unit) tests for pylast.py
 """
-import unittest
+from __future__ import annotations
 
 import pylast
 
@@ -10,7 +10,7 @@ from .test_pylast import TestPyLastWithLastFm
 
 
 class TestPyLastLibrary(TestPyLastWithLastFm):
-    def test_repr(self):
+    def test_repr(self) -> None:
         # Arrange
         library = pylast.Library(user=self.username, network=self.network)
 
@@ -18,9 +18,9 @@ class TestPyLastLibrary(TestPyLastWithLastFm):
         representation = repr(library)
 
         # Assert
-        self.assert_startswith(representation, "pylast.Library(")
+        assert representation.startswith("pylast.Library(")
 
-    def test_str(self):
+    def test_str(self) -> None:
         # Arrange
         library = pylast.Library(user=self.username, network=self.network)
 
@@ -28,23 +28,23 @@ class TestPyLastLibrary(TestPyLastWithLastFm):
         string = str(library)
 
         # Assert
-        self.assert_endswith(string, "'s Library")
+        assert string.endswith("'s Library")
 
-    def test_library_is_hashable(self):
+    def test_library_is_hashable(self) -> None:
         # Arrange
         library = pylast.Library(user=self.username, network=self.network)
 
         # Act/Assert
         self.helper_is_thing_hashable(library)
 
-    def test_cacheable_library(self):
+    def test_cacheable_library(self) -> None:
         # Arrange
         library = pylast.Library(self.username, self.network)
 
         # Act/Assert
         self.helper_validate_cacheable(library, "get_artists")
 
-    def test_get_user(self):
+    def test_get_user(self) -> None:
         # Arrange
         library = pylast.Library(user=self.username, network=self.network)
         user_to_get = self.network.get_user(self.username)
@@ -53,8 +53,4 @@ class TestPyLastLibrary(TestPyLastWithLastFm):
         library_user = library.get_user()
 
         # Assert
-        self.assertEqual(library_user, user_to_get)
+        assert library_user == user_to_get
-
-
-if __name__ == "__main__":
-    unittest.main(failfast=True)

tests/test_librefm.py

@@ -2,20 +2,20 @@
 """
 Integration (not unit) tests for pylast.py
 """
-import unittest
+from __future__ import annotations
 
 from flaky import flaky
 
 import pylast
 
-from .test_pylast import PyLastTestCase, load_secrets
+from .test_pylast import load_secrets
 
 
 @flaky(max_runs=3, min_passes=1)
-class TestPyLastWithLibreFm(PyLastTestCase):
+class TestPyLastWithLibreFm:
     """Own class for Libre.fm because we don't need the Last.fm setUp"""
 
-    def test_libre_fm(self):
+    def test_libre_fm(self) -> None:
         # Arrange
         secrets = load_secrets()
         username = secrets["username"]
@@ -27,9 +27,9 @@ class TestPyLastWithLibreFm(PyLastTestCase):
         name = artist.get_name()
 
         # Assert
-        self.assertEqual(name, "Radiohead")
+        assert name == "Radiohead"
 
-    def test_repr(self):
+    def test_repr(self) -> None:
         # Arrange
         secrets = load_secrets()
         username = secrets["username"]
@@ -40,8 +40,4 @@ class TestPyLastWithLibreFm(PyLastTestCase):
         representation = repr(network)
 
         # Assert
-        self.assert_startswith(representation, "pylast.LibreFMNetwork(")
+        assert representation.startswith("pylast.LibreFMNetwork(")
-
-
-if __name__ == "__main__":
-    unittest.main(failfast=True)

tests/test_network.py

@@ -1,17 +1,22 @@
-#!/usr/bin/env python
 """
 Integration (not unit) tests for pylast.py
 """
+
+from __future__ import annotations
+
+import re
 import time
-import unittest
+
+import pytest
 
 import pylast
 
-from .test_pylast import TestPyLastWithLastFm
+from .test_pylast import WRITE_TEST, TestPyLastWithLastFm
 
 
 class TestPyLastNetwork(TestPyLastWithLastFm):
-    def test_scrobble(self):
+    @pytest.mark.skipif(not WRITE_TEST, reason="Only test once to avoid collisions")
+    def test_scrobble(self) -> None:
         # Arrange
         artist = "test artist"
         title = "test title"
@@ -19,16 +24,17 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         lastfm_user = self.network.get_user(self.username)
 
         # Act
+        self.network.scrobble(artist=artist, title="test title 2", timestamp=timestamp)
         self.network.scrobble(artist=artist, title=title, timestamp=timestamp)
 
         # Assert
         # limit=2 to ignore now-playing:
-        last_scrobble = lastfm_user.get_recent_tracks(limit=2)[0]
+        last_scrobble = list(lastfm_user.get_recent_tracks(limit=2))[0]
-        self.assertEqual(str(last_scrobble.track.artist).lower(), artist)
+        assert str(last_scrobble.track.artist).lower() == artist
-        self.assertEqual(str(last_scrobble.track.title).lower(), title)
+        assert str(last_scrobble.track.title).lower() == title
-        self.assertEqual(str(last_scrobble.timestamp), str(timestamp))
 
-    def test_update_now_playing(self):
+    @pytest.mark.skipif(not WRITE_TEST, reason="Only test once to avoid collisions")
+    def test_update_now_playing(self) -> None:
         # Arrange
         artist = "Test Artist"
         title = "test title"
@@ -43,31 +49,36 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
 
         # Assert
         current_track = lastfm_user.get_now_playing()
-        self.assertIsNotNone(current_track)
+        assert current_track is not None
-        self.assertEqual(str(current_track.title).lower(), "test title")
+        assert str(current_track.title).lower() == "test title"
-        self.assertEqual(str(current_track.artist).lower(), "test artist")
+        assert str(current_track.artist).lower() == "test artist"
+        assert current_track.info["album"] == "Test Album"
+        assert current_track.get_album().title == "Test Album"
 
-    def test_enable_rate_limiting(self):
+        assert len(current_track.info["image"])
+        assert re.search(r"^http.+$", current_track.info["image"][pylast.SIZE_LARGE])
+
+    def test_enable_rate_limiting(self) -> None:
         # Arrange
-        self.assertFalse(self.network.is_rate_limited())
+        assert not self.network.is_rate_limited()
 
         # Act
         self.network.enable_rate_limit()
         then = time.time()
         # Make some network call, limit not applied first time
-        self.network.get_user(self.username)
+        self.network.get_top_artists()
         # Make a second network call, limiting should be applied
         self.network.get_top_artists()
         now = time.time()
 
         # Assert
-        self.assertTrue(self.network.is_rate_limited())
+        assert self.network.is_rate_limited()
-        self.assertGreaterEqual(now - then, 0.2)
+        assert now - then >= 0.2
 
-    def test_disable_rate_limiting(self):
+    def test_disable_rate_limiting(self) -> None:
         # Arrange
         self.network.enable_rate_limit()
-        self.assertTrue(self.network.is_rate_limited())
+        assert self.network.is_rate_limited()
 
         # Act
         self.network.disable_rate_limit()
@@ -77,26 +88,26 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         self.network.get_top_artists()
 
         # Assert
-        self.assertFalse(self.network.is_rate_limited())
+        assert not self.network.is_rate_limited()
 
-    def test_lastfm_network_name(self):
+    def test_lastfm_network_name(self) -> None:
         # Act
         name = str(self.network)
 
         # Assert
-        self.assertEqual(name, "Last.fm Network")
+        assert name == "Last.fm Network"
 
-    def test_geo_get_top_artists(self):
+    def test_geo_get_top_artists(self) -> None:
         # Arrange
         # Act
         artists = self.network.get_geo_top_artists(country="United Kingdom", limit=1)
 
         # Assert
-        self.assertEqual(len(artists), 1)
+        assert len(artists) == 1
-        self.assertIsInstance(artists[0], pylast.TopItem)
+        assert isinstance(artists[0], pylast.TopItem)
-        self.assertIsInstance(artists[0].item, pylast.Artist)
+        assert isinstance(artists[0].item, pylast.Artist)
 
-    def test_geo_get_top_tracks(self):
+    def test_geo_get_top_tracks(self) -> None:
         # Arrange
         # Act
         tracks = self.network.get_geo_top_tracks(
@@ -104,11 +115,11 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         )
 
         # Assert
-        self.assertEqual(len(tracks), 1)
+        assert len(tracks) == 1
-        self.assertIsInstance(tracks[0], pylast.TopItem)
+        assert isinstance(tracks[0], pylast.TopItem)
-        self.assertIsInstance(tracks[0].item, pylast.Track)
+        assert isinstance(tracks[0].item, pylast.Track)
 
-    def test_network_get_top_artists_with_limit(self):
+    def test_network_get_top_artists_with_limit(self) -> None:
         # Arrange
         # Act
         artists = self.network.get_top_artists(limit=1)
@@ -116,7 +127,7 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_top_list(artists, pylast.Artist)
 
-    def test_network_get_top_tags_with_limit(self):
+    def test_network_get_top_tags_with_limit(self) -> None:
         # Arrange
         # Act
         tags = self.network.get_top_tags(limit=1)
@@ -124,7 +135,7 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_top_list(tags, pylast.Tag)
 
-    def test_network_get_top_tags_with_no_limit(self):
+    def test_network_get_top_tags_with_no_limit(self) -> None:
         # Arrange
         # Act
         tags = self.network.get_top_tags()
@@ -132,7 +143,7 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         # Assert
         self.helper_at_least_one_thing_in_top_list(tags, pylast.Tag)
 
-    def test_network_get_top_tracks_with_limit(self):
+    def test_network_get_top_tracks_with_limit(self) -> None:
         # Arrange
         # Act
         tracks = self.network.get_top_tracks(limit=1)
@@ -140,7 +151,7 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_top_list(tracks, pylast.Track)
 
-    def test_country_top_tracks(self):
+    def test_country_top_tracks(self) -> None:
         # Arrange
         country = self.network.get_country("Croatia")
 
@@ -150,7 +161,7 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         # Assert
         self.helper_two_different_things_in_top_list(things, pylast.Track)
 
-    def test_country_network_top_tracks(self):
+    def test_country_network_top_tracks(self) -> None:
         # Arrange
         # Act
         things = self.network.get_geo_top_tracks("Croatia", limit=2)
@@ -158,7 +169,7 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         # Assert
         self.helper_two_different_things_in_top_list(things, pylast.Track)
 
-    def test_tag_top_tracks(self):
+    def test_tag_top_tracks(self) -> None:
         # Arrange
         tag = self.network.get_tag("blues")
 
@@ -168,7 +179,7 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         # Assert
         self.helper_two_different_things_in_top_list(things, pylast.Track)
 
-    def test_album_data(self):
+    def test_album_data(self) -> None:
         # Arrange
         thing = self.network.get_album("Test Artist", "Test Album")
 
@@ -181,14 +192,14 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         url = thing.get_url()
 
         # Assert
-        self.assertEqual(stringed, "Test Artist - Test Album")
+        assert stringed == "Test Artist - Test Album"
-        self.assertIn("pylast.Album('Test Artist', 'Test Album',", rep)
+        assert "pylast.Album('Test Artist', 'Test Album'," in rep
-        self.assertEqual(title, name)
+        assert title == name
-        self.assertIsInstance(playcount, int)
+        assert isinstance(playcount, int)
-        self.assertGreater(playcount, 1)
+        assert playcount > 1
-        self.assertEqual("https://www.last.fm/music/test%2bartist/test%2balbum", url)
+        assert "https://www.last.fm/music/test%2bartist/test%2balbum" == url
 
-    def test_track_data(self):
+    def test_track_data(self) -> None:
         # Arrange
         thing = self.network.get_track("Test Artist", "test title")
 
@@ -201,17 +212,15 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         url = thing.get_url(pylast.DOMAIN_FRENCH)
 
         # Assert
-        self.assertEqual(stringed, "Test Artist - test title")
+        assert stringed == "Test Artist - test title"
-        self.assertIn("pylast.Track('Test Artist', 'test title',", rep)
+        assert "pylast.Track('Test Artist', 'test title'," in rep
-        self.assertEqual(title, "test title")
+        assert title == "test title"
-        self.assertEqual(title, name)
+        assert title == name
-        self.assertIsInstance(playcount, int)
+        assert isinstance(playcount, int)
-        self.assertGreater(playcount, 1)
+        assert playcount > 1
-        self.assertEqual(
+        assert "https://www.last.fm/fr/music/test%2bartist/_/test%2btitle" == url
-            "https://www.last.fm/fr/music/test%2bartist/_/test%2btitle", url
-        )
 
-    def test_country_top_artists(self):
+    def test_country_top_artists(self) -> None:
         # Arrange
         country = self.network.get_country("Ukraine")
 
@@ -221,7 +230,7 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_top_list(artists, pylast.Artist)
 
-    def test_caching(self):
+    def test_caching(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -231,25 +240,25 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         tags2 = user.get_top_tags(limit=1, cacheable=True)
 
         # Assert
-        self.assertTrue(self.network.is_caching_enabled())
+        assert self.network.is_caching_enabled()
-        self.assertEqual(tags1, tags2)
+        assert tags1 == tags2
         self.network.disable_caching()
-        self.assertFalse(self.network.is_caching_enabled())
+        assert not self.network.is_caching_enabled()
 
-    def test_album_mbid(self):
+    def test_album_mbid(self) -> None:
         # Arrange
-        mbid = "a6a265bf-9f81-4055-8224-f7ac0aa6b937"
+        mbid = "03c91c40-49a6-44a7-90e7-a700edf97a62"
 
         # Act
         album = self.network.get_album_by_mbid(mbid)
         album_mbid = album.get_mbid()
 
         # Assert
-        self.assertIsInstance(album, pylast.Album)
+        assert isinstance(album, pylast.Album)
-        self.assertEqual(album.title.lower(), "test")
+        assert album.title == "Believe"
-        self.assertEqual(album_mbid, mbid)
+        assert album_mbid == mbid
 
-    def test_artist_mbid(self):
+    def test_artist_mbid(self) -> None:
         # Arrange
         mbid = "7e84f845-ac16-41fe-9ff8-df12eb32af55"
 
@@ -257,10 +266,10 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         artist = self.network.get_artist_by_mbid(mbid)
 
         # Assert
-        self.assertIsInstance(artist, pylast.Artist)
+        assert isinstance(artist, pylast.Artist)
-        self.assertEqual(artist.name, "MusicBrainz Test Artist")
+        assert artist.name in ("MusicBrainz Test Artist", "MusicBrainzz Test Artist")
 
-    def test_track_mbid(self):
+    def test_track_mbid(self) -> None:
         # Arrange
         mbid = "ebc037b1-cc9c-44f2-a21f-83c219f0e1e0"
 
@@ -269,11 +278,11 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         track_mbid = track.get_mbid()
 
         # Assert
-        self.assertIsInstance(track, pylast.Track)
+        assert isinstance(track, pylast.Track)
-        self.assertEqual(track.title, "first")
+        assert track.title == "first"
-        self.assertEqual(track_mbid, mbid)
+        assert track_mbid == mbid
 
-    def test_init_with_token(self):
+    def test_init_with_token(self) -> None:
         # Arrange/Act
         msg = None
         try:
@@ -286,22 +295,21 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
             msg = str(exc)
 
         # Assert
-        self.assertEqual(msg, "Unauthorized Token - This token has not been issued")
+        assert msg == "Unauthorized Token - This token has not been issued"
 
-    def test_proxy(self):
+    def test_proxy(self) -> None:
         # Arrange
-        host = "https://example.com"
+        proxy = "http://example.com:1234"
-        port = 1234
 
         # Act / Assert
-        self.network.enable_proxy(host, port)
+        self.network.enable_proxy(proxy)
-        self.assertTrue(self.network.is_proxy_enabled())
+        assert self.network.is_proxy_enabled()
-        self.assertEqual(self.network._get_proxy(), ["https://example.com", 1234])
+        assert self.network.proxy == "http://example.com:1234"
 
         self.network.disable_proxy()
-        self.assertFalse(self.network.is_proxy_enabled())
+        assert not self.network.is_proxy_enabled()
 
-    def test_album_search(self):
+    def test_album_search(self) -> None:
         # Arrange
         album = "Nevermind"
 
@@ -310,10 +318,10 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         results = search.get_next_page()
 
         # Assert
-        self.assertIsInstance(results, list)
+        assert isinstance(results, list)
-        self.assertIsInstance(results[0], pylast.Album)
+        assert isinstance(results[0], pylast.Album)
 
-    def test_album_search_images(self):
+    def test_album_search_images(self) -> None:
         # Arrange
         album = "Nevermind"
         search = self.network.search_for_album(album)
@@ -323,17 +331,17 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         images = results[0].info["image"]
 
         # Assert
-        self.assertEqual(len(images), 4)
+        assert len(images) == 4
 
-        self.assert_startswith(images[pylast.SIZE_SMALL], "https://")
+        assert images[pylast.SIZE_SMALL].startswith("https://")
-        self.assert_endswith(images[pylast.SIZE_SMALL], ".png")
+        assert images[pylast.SIZE_SMALL].endswith(".png")
-        self.assertIn("/34s/", images[pylast.SIZE_SMALL])
+        assert "/34s/" in images[pylast.SIZE_SMALL]
 
-        self.assert_startswith(images[pylast.SIZE_EXTRA_LARGE], "https://")
+        assert images[pylast.SIZE_EXTRA_LARGE].startswith("https://")
-        self.assert_endswith(images[pylast.SIZE_EXTRA_LARGE], ".png")
+        assert images[pylast.SIZE_EXTRA_LARGE].endswith(".png")
-        self.assertIn("/300x300/", images[pylast.SIZE_EXTRA_LARGE])
+        assert "/300x300/" in images[pylast.SIZE_EXTRA_LARGE]
 
-    def test_artist_search(self):
+    def test_artist_search(self) -> None:
         # Arrange
         artist = "Nirvana"
 
@@ -342,10 +350,10 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         results = search.get_next_page()
 
         # Assert
-        self.assertIsInstance(results, list)
+        assert isinstance(results, list)
-        self.assertIsInstance(results[0], pylast.Artist)
+        assert isinstance(results[0], pylast.Artist)
 
-    def test_artist_search_images(self):
+    def test_artist_search_images(self) -> None:
         # Arrange
         artist = "Nirvana"
         search = self.network.search_for_artist(artist)
@@ -355,17 +363,17 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         images = results[0].info["image"]
 
         # Assert
-        self.assertEqual(len(images), 5)
+        assert len(images) == 5
 
-        self.assert_startswith(images[pylast.SIZE_SMALL], "https://")
+        assert images[pylast.SIZE_SMALL].startswith("https://")
-        self.assert_endswith(images[pylast.SIZE_SMALL], ".png")
+        assert images[pylast.SIZE_SMALL].endswith(".png")
-        self.assertIn("/34s/", images[pylast.SIZE_SMALL])
+        assert "/34s/" in images[pylast.SIZE_SMALL]
 
-        self.assert_startswith(images[pylast.SIZE_EXTRA_LARGE], "https://")
+        assert images[pylast.SIZE_EXTRA_LARGE].startswith("https://")
-        self.assert_endswith(images[pylast.SIZE_EXTRA_LARGE], ".png")
+        assert images[pylast.SIZE_EXTRA_LARGE].endswith(".png")
-        self.assertIn("/300x300/", images[pylast.SIZE_EXTRA_LARGE])
+        assert "/300x300/" in images[pylast.SIZE_EXTRA_LARGE]
 
-    def test_track_search(self):
+    def test_track_search(self) -> None:
         # Arrange
         artist = "Nirvana"
         track = "Smells Like Teen Spirit"
@@ -375,10 +383,10 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         results = search.get_next_page()
 
         # Assert
-        self.assertIsInstance(results, list)
+        assert isinstance(results, list)
-        self.assertIsInstance(results[0], pylast.Track)
+        assert isinstance(results[0], pylast.Track)
 
-    def test_track_search_images(self):
+    def test_track_search_images(self) -> None:
         # Arrange
         artist = "Nirvana"
         track = "Smells Like Teen Spirit"
@@ -389,17 +397,17 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         images = results[0].info["image"]
 
         # Assert
-        self.assertEqual(len(images), 4)
+        assert len(images) == 4
 
-        self.assert_startswith(images[pylast.SIZE_SMALL], "https://")
+        assert images[pylast.SIZE_SMALL].startswith("https://")
-        self.assert_endswith(images[pylast.SIZE_SMALL], ".png")
+        assert images[pylast.SIZE_SMALL].endswith(".png")
-        self.assertIn("/34s/", images[pylast.SIZE_SMALL])
+        assert "/34s/" in images[pylast.SIZE_SMALL]
 
-        self.assert_startswith(images[pylast.SIZE_EXTRA_LARGE], "https://")
+        assert images[pylast.SIZE_EXTRA_LARGE].startswith("https://")
-        self.assert_endswith(images[pylast.SIZE_EXTRA_LARGE], ".png")
+        assert images[pylast.SIZE_EXTRA_LARGE].endswith(".png")
-        self.assertIn("/300x300/", images[pylast.SIZE_EXTRA_LARGE])
+        assert "/300x300/" in images[pylast.SIZE_EXTRA_LARGE]
 
-    def test_search_get_total_result_count(self):
+    def test_search_get_total_result_count(self) -> None:
         # Arrange
         artist = "Nirvana"
         track = "Smells Like Teen Spirit"
@@ -409,8 +417,4 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
         total = search.get_total_result_count()
 
         # Assert
-        self.assertGreater(int(total), 10000)
+        assert int(total) > 10000
-
-
-if __name__ == "__main__":
-    unittest.main(failfast=True)

tests/test_pylast.py

@@ -2,22 +2,25 @@
 """
 Integration (not unit) tests for pylast.py
 """
+from __future__ import annotations
+
 import os
 import time
-import unittest
 
 import pytest
 from flaky import flaky
 
 import pylast
 
+WRITE_TEST = False
 
-def load_secrets():
+
+def load_secrets():  # pragma: no cover
     secrets_file = "test_pylast.yaml"
     if os.path.isfile(secrets_file):
         import yaml  # pip install pyyaml
 
-        with open(secrets_file, "r") as f:  # see example_test_pylast.yaml
+        with open(secrets_file) as f:  # see example_test_pylast.yaml
             doc = yaml.load(f)
     else:
         doc = {}
@@ -31,40 +34,39 @@ def load_secrets():
     return doc
 
 
-class PyLastTestCase(unittest.TestCase):
+def _no_xfail_rerun_filter(err, name, test, plugin) -> bool:
-    def assert_startswith(self, str, prefix, start=None, end=None):
+    for _ in test.iter_markers(name="xfail"):
-        self.assertTrue(str.startswith(prefix, start, end))
+        return False
-
-    def assert_endswith(self, str, suffix, start=None, end=None):
-        self.assertTrue(str.endswith(suffix, start, end))
 
 
-@flaky(max_runs=3, min_passes=1)
+@flaky(max_runs=3, min_passes=1, rerun_filter=_no_xfail_rerun_filter)
-class TestPyLastWithLastFm(PyLastTestCase):
+class TestPyLastWithLastFm:
-
     secrets = None
 
-    def unix_timestamp(self):
+    @staticmethod
+    def unix_timestamp() -> int:
         return int(time.time())
 
-    def setUp(self):
+    @classmethod
-        if self.__class__.secrets is None:
+    def setup_class(cls) -> None:
-            self.__class__.secrets = load_secrets()
+        if cls.secrets is None:
+            cls.secrets = load_secrets()
 
-        self.username = self.__class__.secrets["username"]
+        cls.username = cls.secrets["username"]
-        password_hash = self.__class__.secrets["password_hash"]
+        password_hash = cls.secrets["password_hash"]
 
-        api_key = self.__class__.secrets["api_key"]
+        api_key = cls.secrets["api_key"]
-        api_secret = self.__class__.secrets["api_secret"]
+        api_secret = cls.secrets["api_secret"]
 
-        self.network = pylast.LastFMNetwork(
+        cls.network = pylast.LastFMNetwork(
             api_key=api_key,
             api_secret=api_secret,
-            username=self.username,
+            username=cls.username,
             password_hash=password_hash,
         )
 
-    def helper_is_thing_hashable(self, thing):
+    @staticmethod
+    def helper_is_thing_hashable(thing) -> None:
         # Arrange
         things = set()
 
@@ -72,21 +74,22 @@ class TestPyLastWithLastFm(PyLastTestCase):
         things.add(thing)
 
         # Assert
-        self.assertIsNotNone(thing)
+        assert thing is not None
-        self.assertEqual(len(things), 1)
+        assert len(things) == 1
 
-    def helper_validate_results(self, a, b, c):
+    @staticmethod
+    def helper_validate_results(a, b, c) -> None:
         # Assert
-        self.assertIsNotNone(a)
+        assert a is not None
-        self.assertIsNotNone(b)
+        assert b is not None
-        self.assertIsNotNone(c)
+        assert c is not None
-        self.assertGreaterEqual(len(a), 0)
+        assert isinstance(len(a), int)
-        self.assertGreaterEqual(len(b), 0)
+        assert isinstance(len(b), int)
-        self.assertGreaterEqual(len(c), 0)
+        assert isinstance(len(c), int)
-        self.assertEqual(a, b)
+        assert a == b
-        self.assertEqual(b, c)
+        assert b == c
 
-    def helper_validate_cacheable(self, thing, function_name):
+    def helper_validate_cacheable(self, thing, function_name) -> None:
         # Arrange
         # get thing.function_name()
         func = getattr(thing, function_name, None)
@@ -94,42 +97,42 @@ class TestPyLastWithLastFm(PyLastTestCase):
         # Act
         result1 = func(limit=1, cacheable=False)
         result2 = func(limit=1, cacheable=True)
-        result3 = func(limit=1)
+        result3 = list(func(limit=1))
 
         # Assert
         self.helper_validate_results(result1, result2, result3)
 
-    def helper_at_least_one_thing_in_top_list(self, things, expected_type):
+    @staticmethod
+    def helper_at_least_one_thing_in_top_list(things, expected_type) -> None:
         # Assert
-        self.assertGreater(len(things), 1)
+        assert len(things) > 1
-        self.assertIsInstance(things, list)
+        assert isinstance(things, list)
-        self.assertIsInstance(things[0], pylast.TopItem)
+        assert isinstance(things[0], pylast.TopItem)
-        self.assertIsInstance(things[0].item, expected_type)
+        assert isinstance(things[0].item, expected_type)
 
-    def helper_only_one_thing_in_top_list(self, things, expected_type):
+    @staticmethod
+    def helper_only_one_thing_in_top_list(things, expected_type) -> None:
         # Assert
-        self.assertEqual(len(things), 1)
+        assert len(things) == 1
-        self.assertIsInstance(things, list)
+        assert isinstance(things, list)
-        self.assertIsInstance(things[0], pylast.TopItem)
+        assert isinstance(things[0], pylast.TopItem)
-        self.assertIsInstance(things[0].item, expected_type)
+        assert isinstance(things[0].item, expected_type)
 
-    def helper_only_one_thing_in_list(self, things, expected_type):
+    @staticmethod
+    def helper_only_one_thing_in_list(things, expected_type) -> None:
         # Assert
-        self.assertEqual(len(things), 1)
+        assert len(things) == 1
-        self.assertIsInstance(things, list)
+        assert isinstance(things, list)
-        self.assertIsInstance(things[0], expected_type)
+        assert isinstance(things[0], expected_type)
 
-    def helper_two_different_things_in_top_list(self, things, expected_type):
+    @staticmethod
+    def helper_two_different_things_in_top_list(things, expected_type) -> None:
         # Assert
-        self.assertEqual(len(things), 2)
+        assert len(things) == 2
         thing1 = things[0]
         thing2 = things[1]
-        self.assertIsInstance(thing1, pylast.TopItem)
+        assert isinstance(thing1, pylast.TopItem)
-        self.assertIsInstance(thing2, pylast.TopItem)
+        assert isinstance(thing2, pylast.TopItem)
-        self.assertIsInstance(thing1.item, expected_type)
+        assert isinstance(thing1.item, expected_type)
-        self.assertIsInstance(thing2.item, expected_type)
+        assert isinstance(thing2.item, expected_type)
-        self.assertNotEqual(thing1, thing2)
+        assert thing1 != thing2
-
-
-if __name__ == "__main__":
-    unittest.main(failfast=True)

tests/test_tag.py

@@ -2,7 +2,7 @@
 """
 Integration (not unit) tests for pylast.py
 """
-import unittest
+from __future__ import annotations
 
 import pylast
 
@@ -10,14 +10,14 @@ from .test_pylast import TestPyLastWithLastFm
 
 
 class TestPyLastTag(TestPyLastWithLastFm):
-    def test_tag_is_hashable(self):
+    def test_tag_is_hashable(self) -> None:
         # Arrange
         tag = self.network.get_top_tags(limit=1)[0]
 
         # Act/Assert
         self.helper_is_thing_hashable(tag)
 
-    def test_tag_top_artists(self):
+    def test_tag_top_artists(self) -> None:
         # Arrange
         tag = self.network.get_tag("blues")
 
@@ -27,7 +27,7 @@ class TestPyLastTag(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_top_list(artists, pylast.Artist)
 
-    def test_tag_top_albums(self):
+    def test_tag_top_albums(self) -> None:
         # Arrange
         tag = self.network.get_tag("blues")
 
@@ -37,7 +37,7 @@ class TestPyLastTag(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_top_list(albums, pylast.Album)
 
-    def test_tags(self):
+    def test_tags(self) -> None:
         # Arrange
         tag1 = self.network.get_tag("blues")
         tag2 = self.network.get_tag("rock")
@@ -49,14 +49,10 @@ class TestPyLastTag(TestPyLastWithLastFm):
         url = tag1.get_url()
 
         # Assert
-        self.assertEqual("blues", tag_str)
+        assert "blues" == tag_str
-        self.assertIn("pylast.Tag", tag_repr)
+        assert "pylast.Tag" in tag_repr
-        self.assertIn("blues", tag_repr)
+        assert "blues" in tag_repr
-        self.assertEqual("blues", name)
+        assert "blues" == name
-        self.assertEqual(tag1, tag1)
+        assert tag1 == tag1
-        self.assertNotEqual(tag1, tag2)
+        assert tag1 != tag2
-        self.assertEqual(url, "https://www.last.fm/tag/blues")
+        assert url == "https://www.last.fm/tag/blues"
-
-
-if __name__ == "__main__":
-    unittest.main(failfast=True)

tests/test_track.py

@@ -1,16 +1,21 @@
-#!/usr/bin/env python
 """
 Integration (not unit) tests for pylast.py
 """
-import unittest
+
+from __future__ import annotations
+
+import time
+
+import pytest
 
 import pylast
 
-from .test_pylast import TestPyLastWithLastFm
+from .test_pylast import WRITE_TEST, TestPyLastWithLastFm
 
 
 class TestPyLastTrack(TestPyLastWithLastFm):
-    def test_love(self):
+    @pytest.mark.skipif(not WRITE_TEST, reason="Only test once to avoid collisions")
+    def test_love(self) -> None:
         # Arrange
         artist = "Test Artist"
         title = "test title"
@@ -21,11 +26,12 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         track.love()
 
         # Assert
-        loved = lastfm_user.get_loved_tracks(limit=1)
+        loved = list(lastfm_user.get_loved_tracks(limit=1))
-        self.assertEqual(str(loved[0].track.artist).lower(), "test artist")
+        assert str(loved[0].track.artist).lower() == "test artist"
-        self.assertEqual(str(loved[0].track.title).lower(), "test title")
+        assert str(loved[0].track.title).lower() == "test title"
 
-    def test_unlove(self):
+    @pytest.mark.skipif(not WRITE_TEST, reason="Only test once to avoid collisions")
+    def test_unlove(self) -> None:
         # Arrange
         artist = pylast.Artist("Test Artist", self.network)
         title = "test title"
@@ -35,14 +41,15 @@ class TestPyLastTrack(TestPyLastWithLastFm):
 
         # Act
         track.unlove()
+        time.sleep(1)  # Delay, for Last.fm latency. TODO Can this be removed later?
 
         # Assert
-        loved = lastfm_user.get_loved_tracks(limit=1)
+        loved = list(lastfm_user.get_loved_tracks(limit=1))
         if len(loved):  # OK to be empty but if not:
-            self.assertNotEqual(str(loved[0].track.artist), "Test Artist")
+            assert str(loved[0].track.artist) != "Test Artist"
-            self.assertNotEqual(str(loved[0].track.title), "test title")
+            assert str(loved[0].track.title) != "test title"
 
-    def test_user_play_count_in_track_info(self):
+    def test_user_play_count_in_track_info(self) -> None:
         # Arrange
         artist = "Test Artist"
         title = "test title"
@@ -54,9 +61,9 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         count = track.get_userplaycount()
 
         # Assert
-        self.assertGreaterEqual(count, 0)
+        assert count >= 0
 
-    def test_user_loved_in_track_info(self):
+    def test_user_loved_in_track_info(self) -> None:
         # Arrange
         artist = "Test Artist"
         title = "test title"
@@ -68,20 +75,20 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         loved = track.get_userloved()
 
         # Assert
-        self.assertIsNotNone(loved)
+        assert loved is not None
-        self.assertIsInstance(loved, bool)
+        assert isinstance(loved, bool)
-        self.assertNotIsInstance(loved, str)
+        assert not isinstance(loved, str)
 
-    def test_track_is_hashable(self):
+    def test_track_is_hashable(self) -> None:
         # Arrange
         artist = self.network.get_artist("Test Artist")
-        track = artist.get_top_tracks()[0].item
+        track = artist.get_top_tracks(stream=False)[0].item
-        self.assertIsInstance(track, pylast.Track)
+        assert isinstance(track, pylast.Track)
 
         # Act/Assert
         self.helper_is_thing_hashable(track)
 
-    def test_track_wiki_content(self):
+    def test_track_wiki_content(self) -> None:
         # Arrange
         track = pylast.Track("Test Artist", "test title", self.network)
 
@@ -89,10 +96,10 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         wiki = track.get_wiki_content()
 
         # Assert
-        self.assertIsNotNone(wiki)
+        assert wiki is not None
-        self.assertGreaterEqual(len(wiki), 1)
+        assert len(wiki) >= 1
 
-    def test_track_wiki_summary(self):
+    def test_track_wiki_summary(self) -> None:
         # Arrange
         track = pylast.Track("Test Artist", "test title", self.network)
 
@@ -100,40 +107,20 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         wiki = track.get_wiki_summary()
 
         # Assert
-        self.assertIsNotNone(wiki)
+        assert wiki is not None
-        self.assertGreaterEqual(len(wiki), 1)
+        assert len(wiki) >= 1
 
-    def test_track_get_duration(self):
+    def test_track_get_duration(self) -> None:
         # Arrange
-        track = pylast.Track("Nirvana", "Lithium", self.network)
+        track = pylast.Track("Daft Punk", "Something About Us", self.network)
 
         # Act
         duration = track.get_duration()
 
         # Assert
-        self.assertGreaterEqual(duration, 200000)
+        assert duration >= 100000
 
-    def test_track_is_streamable(self):
+    def test_track_get_album(self) -> None:
-        # Arrange
-        track = pylast.Track("Nirvana", "Lithium", self.network)
-
-        # Act
-        streamable = track.is_streamable()
-
-        # Assert
-        self.assertFalse(streamable)
-
-    def test_track_is_fulltrack_available(self):
-        # Arrange
-        track = pylast.Track("Nirvana", "Lithium", self.network)
-
-        # Act
-        fulltrack_available = track.is_fulltrack_available()
-
-        # Assert
-        self.assertFalse(fulltrack_available)
-
-    def test_track_get_album(self):
         # Arrange
         track = pylast.Track("Nirvana", "Lithium", self.network)
 
@@ -141,9 +128,9 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         album = track.get_album()
 
         # Assert
-        self.assertEqual(str(album), "Nirvana - Nevermind")
+        assert str(album) == "Nirvana - Nevermind"
 
-    def test_track_get_similar(self):
+    def test_track_get_similar(self) -> None:
         # Arrange
         track = pylast.Track("Cher", "Believe", self.network)
 
@@ -151,33 +138,29 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         similar = track.get_similar()
 
         # Assert
-        found = False
+        found = any(str(track.item) == "Cher - Strong Enough" for track in similar)
-        for track in similar:
+        assert found
-            if str(track.item) == "Madonna - Vogue":
-                found = True
-                break
-        self.assertTrue(found)
 
-    def test_track_get_similar_limits(self):
+    def test_track_get_similar_limits(self) -> None:
         # Arrange
         track = pylast.Track("Cher", "Believe", self.network)
 
         # Act/Assert
-        self.assertEqual(len(track.get_similar(limit=20)), 20)
+        assert len(track.get_similar(limit=20)) == 20
-        self.assertLessEqual(len(track.get_similar(limit=10)), 10)
+        assert len(track.get_similar(limit=10)) <= 10
-        self.assertGreaterEqual(len(track.get_similar(limit=None)), 23)
+        assert len(track.get_similar(limit=None)) >= 23
-        self.assertGreaterEqual(len(track.get_similar(limit=0)), 23)
+        assert len(track.get_similar(limit=0)) >= 23
 
-    def test_tracks_notequal(self):
+    def test_tracks_notequal(self) -> None:
         # Arrange
         track1 = pylast.Track("Test Artist", "test title", self.network)
         track2 = pylast.Track("Test Artist", "Test Track", self.network)
 
         # Act
         # Assert
-        self.assertNotEqual(track1, track2)
+        assert track1 != track2
 
-    def test_track_title_prop_caps(self):
+    def test_track_title_prop_caps(self) -> None:
         # Arrange
         track = pylast.Track("test artist", "test title", self.network)
 
@@ -185,9 +168,9 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         title = track.get_title(properly_capitalized=True)
 
         # Assert
-        self.assertEqual(title, "Test Title")
+        assert title == "Test Title"
 
-    def test_track_listener_count(self):
+    def test_track_listener_count(self) -> None:
         # Arrange
         track = pylast.Track("test artist", "test title", self.network)
 
@@ -195,9 +178,9 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         count = track.get_listener_count()
 
         # Assert
-        self.assertGreater(count, 21)
+        assert count > 21
 
-    def test_album_tracks(self):
+    def test_album_tracks(self) -> None:
         # Arrange
         album = pylast.Album("Test Artist", "Test", self.network)
 
@@ -206,28 +189,28 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         url = tracks[0].get_url()
 
         # Assert
-        self.assertIsInstance(tracks, list)
+        assert isinstance(tracks, list)
-        self.assertIsInstance(tracks[0], pylast.Track)
+        assert isinstance(tracks[0], pylast.Track)
-        self.assertEqual(len(tracks), 1)
+        assert len(tracks) == 1
-        self.assertTrue(url.startswith("https://www.last.fm/music/test"))
+        assert url.startswith("https://www.last.fm/music/test")
 
-    def test_track_eq_none_is_false(self):
+    def test_track_eq_none_is_false(self) -> None:
         # Arrange
         track1 = None
         track2 = pylast.Track("Test Artist", "test title", self.network)
 
         # Act / Assert
-        self.assertNotEqual(track1, track2)
+        assert track1 != track2
 
-    def test_track_ne_none_is_true(self):
+    def test_track_ne_none_is_true(self) -> None:
         # Arrange
         track1 = None
         track2 = pylast.Track("Test Artist", "test title", self.network)
 
         # Act / Assert
-        self.assertNotEqual(track1, track2)
+        assert track1 != track2
 
-    def test_track_get_correction(self):
+    def test_track_get_correction(self) -> None:
         # Arrange
         track = pylast.Track("Guns N' Roses", "mrbrownstone", self.network)
 
@@ -235,9 +218,9 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         corrected_track_name = track.get_correction()
 
         # Assert
-        self.assertEqual(corrected_track_name, "Mr. Brownstone")
+        assert corrected_track_name == "Mr. Brownstone"
 
-    def test_track_with_no_mbid(self):
+    def test_track_with_no_mbid(self) -> None:
         # Arrange
         track = pylast.Track("Static-X", "Set It Off", self.network)
 
@@ -245,8 +228,4 @@ class TestPyLastTrack(TestPyLastWithLastFm):
         mbid = track.get_mbid()
 
         # Assert
-        self.assertIsNone(mbid)
+        assert mbid is None
-
-
-if __name__ == "__main__":
-    unittest.main(failfast=True)

tests/test_user.py

@@ -2,8 +2,15 @@
 """
 Integration (not unit) tests for pylast.py
 """
+from __future__ import annotations
+
+import calendar
+import datetime as dt
+import inspect
 import os
-import unittest
+import re
+
+import pytest
 
 import pylast
 
@@ -11,7 +18,7 @@ from .test_pylast import TestPyLastWithLastFm
 
 
 class TestPyLastUser(TestPyLastWithLastFm):
-    def test_repr(self):
+    def test_repr(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -19,9 +26,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
         representation = repr(user)
 
         # Assert
-        self.assert_startswith(representation, "pylast.User('RJ',")
+        assert representation.startswith("pylast.User('RJ',")
 
-    def test_str(self):
+    def test_str(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -29,9 +36,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
         string = str(user)
 
         # Assert
-        self.assertEqual(string, "RJ")
+        assert string == "RJ"
 
-    def test_equality(self):
+    def test_equality(self) -> None:
         # Arrange
         user_1a = self.network.get_user("RJ")
         user_1b = self.network.get_user("RJ")
@@ -39,11 +46,11 @@ class TestPyLastUser(TestPyLastWithLastFm):
         not_a_user = self.network
 
         # Act / Assert
-        self.assertEqual(user_1a, user_1b)
+        assert user_1a == user_1b
-        self.assertNotEqual(user_1a, user_2)
+        assert user_1a != user_2
-        self.assertNotEqual(user_1a, not_a_user)
+        assert user_1a != not_a_user
 
-    def test_get_name(self):
+    def test_get_name(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -51,9 +58,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
         name = user.get_name(properly_capitalized=True)
 
         # Assert
-        self.assertEqual(name, "RJ")
+        assert name == "RJ"
 
-    def test_get_user_registration(self):
+    def test_get_user_registration(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -63,13 +70,13 @@ class TestPyLastUser(TestPyLastWithLastFm):
         # Assert
         if int(registered):
             # Last.fm API broken? Used to be yyyy-mm-dd not Unix timestamp
-            self.assertEqual(registered, "1037793040")
+            assert registered == "1037793040"
-        else:
+        else:  # pragma: no cover
             # Old way
             # Just check date because of timezones
-            self.assertIn("2002-11-20 ", registered)
+            assert "2002-11-20 " in registered
 
-    def test_get_user_unixtime_registration(self):
+    def test_get_user_unixtime_registration(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -78,9 +85,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
 
         # Assert
         # Just check date because of timezones
-        self.assertEqual(unixtime_registered, 1037793040)
+        assert unixtime_registered == 1037793040
 
-    def test_get_countryless_user(self):
+    def test_get_countryless_user(self) -> None:
         # Arrange
         # Currently test_user has no country set:
         lastfm_user = self.network.get_user("test_user")
@@ -89,9 +96,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
         country = lastfm_user.get_country()
 
         # Assert
-        self.assertIsNone(country)
+        assert country is None
 
-    def test_user_get_country(self):
+    def test_user_get_country(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user("RJ")
 
@@ -99,9 +106,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
         country = lastfm_user.get_country()
 
         # Assert
-        self.assertEqual(str(country), "United Kingdom")
+        assert str(country) == "United Kingdom"
 
-    def test_user_equals_none(self):
+    def test_user_equals_none(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user(self.username)
 
@@ -109,9 +116,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
         value = lastfm_user is None
 
         # Assert
-        self.assertFalse(value)
+        assert not value
 
-    def test_user_not_equal_to_none(self):
+    def test_user_not_equal_to_none(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user(self.username)
 
@@ -119,9 +126,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
         value = lastfm_user is not None
 
         # Assert
-        self.assertTrue(value)
+        assert value
 
-    def test_now_playing_user_with_no_scrobbles(self):
+    def test_now_playing_user_with_no_scrobbles(self) -> None:
         # Arrange
         # Currently test-account has no scrobbles:
         user = self.network.get_user("test-account")
@@ -130,20 +137,20 @@ class TestPyLastUser(TestPyLastWithLastFm):
         current_track = user.get_now_playing()
 
         # Assert
-        self.assertIsNone(current_track)
+        assert current_track is None
 
-    def test_love_limits(self):
+    def test_love_limits(self) -> None:
         # Arrange
         # Currently test-account has at least 23 loved tracks:
         user = self.network.get_user("test-user")
 
         # Act/Assert
-        self.assertEqual(len(user.get_loved_tracks(limit=20)), 20)
+        assert len(user.get_loved_tracks(limit=20)) == 20
-        self.assertLessEqual(len(user.get_loved_tracks(limit=100)), 100)
+        assert len(user.get_loved_tracks(limit=100)) <= 100
-        self.assertGreaterEqual(len(user.get_loved_tracks(limit=None)), 23)
+        assert len(user.get_loved_tracks(limit=None)) >= 23
-        self.assertGreaterEqual(len(user.get_loved_tracks(limit=0)), 23)
+        assert len(user.get_loved_tracks(limit=0)) >= 23
 
-    def test_user_is_hashable(self):
+    def test_user_is_hashable(self) -> None:
         # Arrange
         user = self.network.get_user(self.username)
 
@@ -164,7 +171,7 @@ class TestPyLastUser(TestPyLastWithLastFm):
     #     # Assert
     #     self.assertGreaterEqual(len(tracks), 0)
 
-    def test_pickle(self):
+    def test_pickle(self) -> None:
         # Arrange
         import pickle
 
@@ -179,30 +186,24 @@ class TestPyLastUser(TestPyLastWithLastFm):
         os.remove(filename)
 
         # Assert
-        self.assertEqual(lastfm_user, loaded_user)
+        assert lastfm_user == loaded_user
 
-    def test_cacheable_user_artist_tracks(self):
+    @pytest.mark.xfail
-        # Arrange
+    def test_cacheable_user(self) -> None:
-        lastfm_user = self.network.get_authenticated_user()
-
-        # Act
-        result1 = lastfm_user.get_artist_tracks("Test Artist", cacheable=False)
-        result2 = lastfm_user.get_artist_tracks("Test Artist", cacheable=True)
-        result3 = lastfm_user.get_artist_tracks("Test Artist")
-
-        # Assert
-        self.helper_validate_results(result1, result2, result3)
-
-    def test_cacheable_user(self):
         # Arrange
         lastfm_user = self.network.get_authenticated_user()
 
         # Act/Assert
         self.helper_validate_cacheable(lastfm_user, "get_friends")
-        self.helper_validate_cacheable(lastfm_user, "get_loved_tracks")
+        # no cover whilst xfail:
-        self.helper_validate_cacheable(lastfm_user, "get_recent_tracks")
+        self.helper_validate_cacheable(  # pragma: no cover
+            lastfm_user, "get_loved_tracks"
+        )
+        self.helper_validate_cacheable(  # pragma: no cover
+            lastfm_user, "get_recent_tracks"
+        )
 
-    def test_user_get_top_tags_with_limit(self):
+    def test_user_get_top_tags_with_limit(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -212,7 +213,7 @@ class TestPyLastUser(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_top_list(tags, pylast.Tag)
 
-    def test_user_top_tracks(self):
+    def test_user_top_tracks(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user("RJ")
 
@@ -222,14 +223,14 @@ class TestPyLastUser(TestPyLastWithLastFm):
         # Assert
         self.helper_two_different_things_in_top_list(things, pylast.Track)
 
-    def helper_assert_chart(self, chart, expected_type):
+    def helper_assert_chart(self, chart, expected_type) -> None:
         # Assert
-        self.assertIsNotNone(chart)
+        assert chart is not None
-        self.assertGreater(len(chart), 0)
+        assert len(chart) > 0
-        self.assertIsInstance(chart[0], pylast.TopItem)
+        assert isinstance(chart[0], pylast.TopItem)
-        self.assertIsInstance(chart[0].item, expected_type)
+        assert isinstance(chart[0].item, expected_type)
 
-    def helper_get_assert_charts(self, thing, date):
+    def helper_get_assert_charts(self, thing, date) -> None:
         # Arrange
         album_chart, track_chart = None, None
         (from_date, to_date) = date
@@ -246,14 +247,14 @@ class TestPyLastUser(TestPyLastWithLastFm):
             self.helper_assert_chart(album_chart, pylast.Album)
             self.helper_assert_chart(track_chart, pylast.Track)
 
-    def helper_dates_valid(self, dates):
+    def helper_dates_valid(self, dates) -> None:
         # Assert
-        self.assertGreaterEqual(len(dates), 1)
+        assert len(dates) >= 1
-        self.assertIsInstance(dates[0], tuple)
+        assert isinstance(dates[0], tuple)
         (start, end) = dates[0]
-        self.assertLess(start, end)
+        assert start < end
 
-    def test_user_charts(self):
+    def test_user_charts(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user("RJ")
         dates = lastfm_user.get_weekly_chart_dates()
@@ -262,7 +263,7 @@ class TestPyLastUser(TestPyLastWithLastFm):
         # Act/Assert
         self.helper_get_assert_charts(lastfm_user, dates[0])
 
-    def test_user_top_artists(self):
+    def test_user_top_artists(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user(self.username)
 
@@ -272,7 +273,7 @@ class TestPyLastUser(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_top_list(artists, pylast.Artist)
 
-    def test_user_top_albums(self):
+    def test_user_top_albums(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -282,7 +283,11 @@ class TestPyLastUser(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_top_list(albums, pylast.Album)
 
-    def test_user_tagged_artists(self):
+        top_album = albums[0].item
+        assert len(top_album.info["image"])
+        assert re.search(r"^http.+$", top_album.info["image"][pylast.SIZE_LARGE])
+
+    def test_user_tagged_artists(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user(self.username)
         tags = ["artisttagola"]
@@ -295,7 +300,7 @@ class TestPyLastUser(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_list(artists, pylast.Artist)
 
-    def test_user_tagged_albums(self):
+    def test_user_tagged_albums(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user(self.username)
         tags = ["albumtagola"]
@@ -308,7 +313,7 @@ class TestPyLastUser(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_list(albums, pylast.Album)
 
-    def test_user_tagged_tracks(self):
+    def test_user_tagged_tracks(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user(self.username)
         tags = ["tracktagola"]
@@ -321,7 +326,7 @@ class TestPyLastUser(TestPyLastWithLastFm):
         # Assert
         self.helper_only_one_thing_in_list(tracks, pylast.Track)
 
-    def test_user_subscriber(self):
+    def test_user_subscriber(self) -> None:
         # Arrange
         subscriber = self.network.get_user("RJ")
         non_subscriber = self.network.get_user("Test User")
@@ -331,10 +336,10 @@ class TestPyLastUser(TestPyLastWithLastFm):
         non_subscriber_is_subscriber = non_subscriber.is_subscriber()
 
         # Assert
-        self.assertTrue(subscriber_is_subscriber)
+        assert subscriber_is_subscriber
-        self.assertFalse(non_subscriber_is_subscriber)
+        assert not non_subscriber_is_subscriber
 
-    def test_user_get_image(self):
+    def test_user_get_image(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -342,9 +347,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
         url = user.get_image()
 
         # Assert
-        self.assert_startswith(url, "https://")
+        assert url.startswith("https://")
 
-    def test_user_get_library(self):
+    def test_user_get_library(self) -> None:
         # Arrange
         user = self.network.get_user(self.username)
 
@@ -352,17 +357,13 @@ class TestPyLastUser(TestPyLastWithLastFm):
         library = user.get_library()
 
         # Assert
-        self.assertIsInstance(library, pylast.Library)
+        assert isinstance(library, pylast.Library)
 
-    def test_get_recent_tracks_from_to(self):
+    def test_get_recent_tracks_from_to(self) -> None:
         # Arrange
         lastfm_user = self.network.get_user("RJ")
-
+        start = dt.datetime(2011, 7, 21, 15, 10)
-        from datetime import datetime
+        end = dt.datetime(2011, 7, 21, 15, 15)
-
-        start = datetime(2011, 7, 21, 15, 10)
-        end = datetime(2011, 7, 21, 15, 15)
-        import calendar
 
         utc_start = calendar.timegm(start.utctimetuple())
         utc_end = calendar.timegm(end.utctimetuple())
@@ -371,11 +372,47 @@ class TestPyLastUser(TestPyLastWithLastFm):
         tracks = lastfm_user.get_recent_tracks(time_from=utc_start, time_to=utc_end)
 
         # Assert
-        self.assertEqual(len(tracks), 1)
+        assert len(tracks) == 1
-        self.assertEqual(str(tracks[0].track.artist), "Johnny Cash")
+        assert str(tracks[0].track.artist) == "Johnny Cash"
-        self.assertEqual(str(tracks[0].track.title), "Ring of Fire")
+        assert str(tracks[0].track.title) == "Ring of Fire"
 
-    def test_get_playcount(self):
+    def test_get_recent_tracks_limit_none(self) -> None:
+        # Arrange
+        lastfm_user = self.network.get_user("bbc6music")
+        start = dt.datetime(2020, 2, 15, 15, 00)
+        end = dt.datetime(2020, 2, 15, 15, 40)
+
+        utc_start = calendar.timegm(start.utctimetuple())
+        utc_end = calendar.timegm(end.utctimetuple())
+
+        # Act
+        tracks = lastfm_user.get_recent_tracks(
+            time_from=utc_start, time_to=utc_end, limit=None
+        )
+
+        # Assert
+        assert len(tracks) == 11
+        assert str(tracks[0].track.artist) == "Seun Kuti & Egypt 80"
+        assert str(tracks[0].track.title) == "Struggles Sounds"
+
+    def test_get_recent_tracks_is_streamable(self) -> None:
+        # Arrange
+        lastfm_user = self.network.get_user("bbc6music")
+        start = dt.datetime(2020, 2, 15, 15, 00)
+        end = dt.datetime(2020, 2, 15, 15, 40)
+
+        utc_start = calendar.timegm(start.utctimetuple())
+        utc_end = calendar.timegm(end.utctimetuple())
+
+        # Act
+        tracks = lastfm_user.get_recent_tracks(
+            time_from=utc_start, time_to=utc_end, limit=None, stream=True
+        )
+
+        # Assert
+        assert inspect.isgenerator(tracks)
+
+    def test_get_playcount(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -383,9 +420,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
         playcount = user.get_playcount()
 
         # Assert
-        self.assertGreaterEqual(playcount, 128387)
+        assert playcount >= 128387
 
-    def test_get_image(self):
+    def test_get_image(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -393,10 +430,10 @@ class TestPyLastUser(TestPyLastWithLastFm):
         image = user.get_image()
 
         # Assert
-        self.assert_startswith(image, "https://")
+        assert image.startswith("https://")
-        self.assert_endswith(image, ".png")
+        assert image.endswith(".png")
 
-    def test_get_url(self):
+    def test_get_url(self) -> None:
         # Arrange
         user = self.network.get_user("RJ")
 
@@ -404,9 +441,9 @@ class TestPyLastUser(TestPyLastWithLastFm):
         url = user.get_url()
 
         # Assert
-        self.assertEqual(url, "https://www.last.fm/user/rj")
+        assert url == "https://www.last.fm/user/rj"
 
-    def test_get_weekly_artist_charts(self):
+    def test_get_weekly_artist_charts(self) -> None:
         # Arrange
         user = self.network.get_user("bbc6music")
 
@@ -415,10 +452,10 @@ class TestPyLastUser(TestPyLastWithLastFm):
         artist, weight = charts[0]
 
         # Assert
-        self.assertIsNotNone(artist)
+        assert artist is not None
-        self.assertIsInstance(artist.network, pylast.LastFMNetwork)
+        assert isinstance(artist.network, pylast.LastFMNetwork)
 
-    def test_get_weekly_track_charts(self):
+    def test_get_weekly_track_charts(self) -> None:
         # Arrange
         user = self.network.get_user("bbc6music")
 
@@ -427,9 +464,33 @@ class TestPyLastUser(TestPyLastWithLastFm):
         track, weight = charts[0]
 
         # Assert
-        self.assertIsNotNone(track)
+        assert track is not None
-        self.assertIsInstance(track.network, pylast.LastFMNetwork)
+        assert isinstance(track.network, pylast.LastFMNetwork)
 
+    def test_user_get_track_scrobbles(self) -> None:
+        # Arrange
+        artist = "France Gall"
+        title = "Laisse Tomber Les Filles"
+        user = self.network.get_user("bbc6music")
 
-if __name__ == "__main__":
+        # Act
-    unittest.main(failfast=True)
+        scrobbles = user.get_track_scrobbles(artist, title)
+
+        # Assert
+        assert len(scrobbles) > 0
+        assert str(scrobbles[0].track.artist) == "France Gall"
+        assert scrobbles[0].track.title == "Laisse Tomber Les Filles"
+
+    def test_cacheable_user_get_track_scrobbles(self) -> None:
+        # Arrange
+        artist = "France Gall"
+        title = "Laisse Tomber Les Filles"
+        user = self.network.get_user("bbc6music")
+
+        # Act
+        result1 = user.get_track_scrobbles(artist, title, cacheable=False)
+        result2 = list(user.get_track_scrobbles(artist, title, cacheable=True))
+        result3 = list(user.get_track_scrobbles(artist, title))
+
+        # Assert
+        self.helper_validate_results(result1, result2, result3)

tests/unicode_test.py

@@ -1,5 +1,7 @@
-# -*- coding: utf-8 -*-
+from __future__ import annotations
-import mock
+
+from unittest import mock
+
 import pytest
 
 import pylast
@@ -18,12 +20,51 @@ def mock_network():
         "fdasfdsafsaf not unicode",
     ],
 )
-def test_get_cache_key(artist):
+def test_get_cache_key(artist) -> None:
     request = pylast._Request(mock_network(), "some_method", params={"artist": artist})
     request._get_cache_key()
 
 
 @pytest.mark.parametrize("obj", [pylast.Artist("B\xe9l", mock_network())])
-def test_cast_and_hash(obj):
+def test_cast_and_hash(obj) -> None:
-    assert type(str(obj)) is str
+    assert isinstance(str(obj), str)
     assert isinstance(hash(obj), int)
+
+
+@pytest.mark.parametrize(
+    "test_input, expected",
+    [
+        (
+            # Plain text
+            '<album mbid="">test album name</album>',
+            '<album mbid="">test album name</album>',
+        ),
+        (
+            # Contains Unicode ENQ Enquiry control character
+            '<album mbid="">test album \u0005name</album>',
+            '<album mbid="">test album name</album>',
+        ),
+    ],
+)
+def test__remove_invalid_xml_chars(test_input: str, expected: str) -> None:
+    assert pylast._remove_invalid_xml_chars(test_input) == expected
+
+
+@pytest.mark.parametrize(
+    "test_input, expected",
+    [
+        (
+            # Plain text
+            '<album mbid="">test album name</album>',
+            '<?xml version="1.0" ?><album mbid="">test album name</album>',
+        ),
+        (
+            # Contains Unicode ENQ Enquiry control character
+            '<album mbid="">test album \u0005name</album>',
+            '<?xml version="1.0" ?><album mbid="">test album name</album>',
+        ),
+    ],
+)
+def test__parse_response(test_input: str, expected: str) -> None:
+    doc = pylast._parse_response(test_input)
+    assert doc.toxml() == expected

tox.ini

@@ -1,31 +1,40 @@
 [tox]
-envlist = py37, py36, py35, pypy3, py38dev
+requires =
-recreate = False
+    tox>=4.2
+env_list =
+    lint
+    py{py3, 313, 312, 311, 310, 39, 38}
 
 [testenv]
-setenv =
+extras =
-    PYLAST_USERNAME={env:PYLAST_USERNAME:}
+    tests
-    PYLAST_PASSWORD_HASH={env:PYLAST_PASSWORD_HASH:}
+pass_env =
-    PYLAST_API_KEY={env:PYLAST_API_KEY:}
+    FORCE_COLOR
-    PYLAST_API_SECRET={env:PYLAST_API_SECRET:}
+    PYLAST_API_KEY
-deps =
+    PYLAST_API_SECRET
-    pyyaml
+    PYLAST_PASSWORD_HASH
-    pytest
+    PYLAST_USERNAME
-    mock
+commands =
-    ipdb
+    {envpython} -m pytest -v -s -W all \
-    pytest-cov
+      --cov pylast \
-    flaky
+      --cov tests \
-commands = pytest -v -s -W all --cov pylast --cov-report term-missing {posargs}
+      --cov-report html \
-
+      --cov-report term-missing \
-[testenv:venv]
+      --cov-report xml \
-deps = ipdb
+      --random-order \
-commands = {posargs}
+      {posargs}
 
 [testenv:lint]
+skip_install = true
 deps =
-    flake8
+    pre-commit
-    pep8-naming
+pass_env =
-    black
+    PRE_COMMIT_COLOR
 commands =
-    flake8 .
+    pre-commit run --all-files --show-diff-on-failure
-    black --check --diff .
+
+[testenv:venv]
+deps =
+    ipdb
+commands =
+    {posargs}