From b2c962049faef9da3b967ee0914e841c9db60782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 23 Jul 2022 14:16:52 +0300 Subject: [PATCH 1/4] Use trakt from git repository --- Pipfile | 2 +- Pipfile.lock | 6 +++--- requirements.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Pipfile b/Pipfile index b3ef5bc5de6..6719263b7d7 100644 --- a/Pipfile +++ b/Pipfile @@ -20,7 +20,7 @@ requests = ">=2.25.1" requests-cache = "==0.9.6" rich = "==12.6.0" tqdm = "==4.64.1" -trakt = "==3.4.0" +trakt = {ref = "3.4.0", git = "https://github.com/glensc/python-trakt"} urllib3 = ">=1.26.6" websocket-client = "==1.4.1" diff --git a/Pipfile.lock b/Pipfile.lock index 6c9693b034f..d449cd3265a 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "0db3457f8af6d05dda5515e43fb1f715b4bbda008f068aa8c085477ef67e7eb8" + "sha256": "fcb075b2517afb0196bd8dae72905c7f8aec06d05d2321cb472a19064f49bfb8" }, "pipfile-spec": 6, "requires": { @@ -254,12 +254,12 @@ "version": "==4.64.1" }, "trakt": { + "git": "https://github.com/glensc/python-trakt", "hashes": [ "sha256:1efd909378a09dd0abc3f056e12b2c18cad20cc699bfd211d1807414ba77d90d", "sha256:a5f54258102c747ff50f3ffecc8ed52f20706938f620da4dd016d47ee4fd75ae" ], - "index": "pypi", - "version": "==3.4.0" + "ref": "8a6d4f168a858447014fb4c2c0efceb47b30ebb7" }, "url-normalize": { "hashes": [ diff --git a/requirements.txt b/requirements.txt index 9e2214581c1..79cc914c835 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,7 @@ click==8.1.3 commonmark==0.9.1 deprecated==1.2.13 exceptiongroup==1.0.0rc9; python_version < '3.11' +git+https://github.com/glensc/python-trakt@3.4.0#egg=trakt idna==3.4; python_version >= '3.5' inquirerpy==0.3.4 oauthlib==3.2.2; python_version >= '3.6' @@ -31,7 +32,6 @@ requests==2.28.1 rich==12.6.0 six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' tqdm==4.64.1 -trakt==3.4.0 url-normalize==1.4.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' urllib3==1.26.12 wcwidth==0.2.5 From b8afd9c3a350d051bfb1c9e314b0937b06e8aee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 23 Oct 2022 15:13:56 +0300 Subject: [PATCH 2/4] Try installing from zip url --- Pipfile | 2 +- Pipfile.lock | 10 +++------- requirements.txt | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Pipfile b/Pipfile index 6719263b7d7..2ac19d4e528 100644 --- a/Pipfile +++ b/Pipfile @@ -20,9 +20,9 @@ requests = ">=2.25.1" requests-cache = "==0.9.6" rich = "==12.6.0" tqdm = "==4.64.1" -trakt = {ref = "3.4.0", git = "https://github.com/glensc/python-trakt"} urllib3 = ">=1.26.6" websocket-client = "==1.4.1" +trakt = {file = "https://github.com/glensc/python-trakt/archive/refs/tags/3.4.0.zip"} [requires] python_version = "3" diff --git a/Pipfile.lock b/Pipfile.lock index d449cd3265a..b99b22f0c35 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "fcb075b2517afb0196bd8dae72905c7f8aec06d05d2321cb472a19064f49bfb8" + "sha256": "d879198c5226ee72ac817e91d805550e857f484485b1085d345408765377c318" }, "pipfile-spec": 6, "requires": { @@ -254,12 +254,8 @@ "version": "==4.64.1" }, "trakt": { - "git": "https://github.com/glensc/python-trakt", - "hashes": [ - "sha256:1efd909378a09dd0abc3f056e12b2c18cad20cc699bfd211d1807414ba77d90d", - "sha256:a5f54258102c747ff50f3ffecc8ed52f20706938f620da4dd016d47ee4fd75ae" - ], - "ref": "8a6d4f168a858447014fb4c2c0efceb47b30ebb7" + "file": "https://github.com/glensc/python-trakt/archive/refs/tags/3.4.0.zip", + "version": "==3.4.0" }, "url-normalize": { "hashes": [ diff --git a/requirements.txt b/requirements.txt index 79cc914c835..e827dba1f47 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ click==8.1.3 commonmark==0.9.1 deprecated==1.2.13 exceptiongroup==1.0.0rc9; python_version < '3.11' -git+https://github.com/glensc/python-trakt@3.4.0#egg=trakt +https://github.com/glensc/python-trakt/archive/refs/tags/3.4.0.zip#egg=trakt idna==3.4; python_version >= '3.5' inquirerpy==0.3.4 oauthlib==3.2.2; python_version >= '3.6' From 22b0f26f7aee977702a6577ed346cbe0eb4981bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 23 Oct 2022 15:43:51 +0300 Subject: [PATCH 3/4] Use trakt@ marker - https://setuptools.pypa.io/en/latest/userguide/dependency_management.html#direct-url-dependencies --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e827dba1f47..69482792c5d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ click==8.1.3 commonmark==0.9.1 deprecated==1.2.13 exceptiongroup==1.0.0rc9; python_version < '3.11' -https://github.com/glensc/python-trakt/archive/refs/tags/3.4.0.zip#egg=trakt +trakt @ https://github.com/glensc/python-trakt/archive/refs/tags/3.4.0.zip#egg=trakt idna==3.4; python_version >= '3.5' inquirerpy==0.3.4 oauthlib==3.2.2; python_version >= '3.6' From a28fa88901eeb271385ad66f26261b02311e5e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 23 Oct 2022 16:01:02 +0300 Subject: [PATCH 4/4] Add trakt dependency update instructions --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 45b5b91f9e5..c9fe27bc4ab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -180,6 +180,13 @@ pipenv run plextraktsync [pipenv]: https://pipenv.pypa.io/ +## Updating trakt dependency + +1. Update version in `trakt/__init__py`, commit, push it +1. Add git tag, push it +1. Run `pipenv install "trakt@https://github.com/glensc/python-trakt/archive/refs/tags/3.4.1.zip#egg=trakt"` +1. Update trakt version manually in `requirements.txt`, `pipenv lock --requirements` loses the `trakt@` prefix + ## Testing We use [pytest] for testing.