Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: Tests
on:
# Triggers the workflow on push to any branch or pull request events only on the "develop" branch
push:
branches: [ "*" ]
branches: ["*"]
pull_request:
branches: [ "develop" ]
branches: ["develop"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", pypy3.9]
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "pypy3.11"]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand All @@ -44,20 +44,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
- name: Set up Python 3.12
uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox
- name: lint and get coverage with tox
run: |
tox -e flake8
tox -e py312
tox -e lint
tox -e stats
- name: Report to coveralls
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./coverage.lcov

2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pyhamcrest = "*"
build = "*"
pbr = "*"
setuptools = "*"
tox = "*"

[requires]
python_version = "3.10"
python_full_version = "3.10.9"
458 changes: 252 additions & 206 deletions Pipfile.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ classifiers =
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.7
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 :: 3.14
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: PyPy
Topic :: Software Development :: Libraries
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[tox]
requires =
tox>=4
env_list = clean, py{37,38,39,310,311}, pypy, stats, lint
env_list = clean, py{310,311,312,313,314}, pypy, stats, lint
skipsdist = True

[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310
3.11: py311
pypy-3.7: pypy
3.12: py312
3.13: py313
3.14: py314
pypy-3.11: pypy

[testenv]
description = run unit tests
Expand All @@ -35,7 +35,7 @@ allowlist_externals =
commands = sphinx-build -a -b html docs build/sphinx

[testenv:lint]
basepython = python3.10
basepython = python3.12
skip_install = true
deps =
flake8
Expand Down
2 changes: 1 addition & 1 deletion trakt/mapper/core/base.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


from trakt.objects import User, Movie, Show, Episode, Season, CustomList, Comment, Person, PublicList,\
from trakt.objects import User, Movie, Show, Episode, Season, CustomList, Comment, Person, PublicList, \
WatchedProgress, CollectionProgress, HiddenShow, HiddenMovie, HiddenSeason, HiddenUser

IDENTIFIERS = {
Expand Down
2 changes: 1 addition & 1 deletion trakt/objects/movie.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


from trakt.core.helpers import from_iso8601_datetime, to_iso8601_datetime,\
from trakt.core.helpers import from_iso8601_datetime, to_iso8601_datetime, \
from_iso8601_date, to_iso8601_date, deprecated
from trakt.objects.core.helpers import update_attributes
from trakt.objects.video import Video
Expand Down