From f2cd66c4d31b0e89f45faeae4e8608473f20534a Mon Sep 17 00:00:00 2001 From: h3llrais3r Date: Sat, 13 Nov 2021 17:36:08 +0100 Subject: [PATCH] Downgrade importlib-metadata to version 4.2.0 This is required to be able to update the dev tools to their latest environment. --- .build/generated/requirements-deptree.md | 2 +- .build/generated/requirements-imported.md | 12 ++--- .build/generated/requirements.md | 2 +- poetry.lock | 63 +++++++++-------------- pyproject.toml | 7 ++- requirements.txt | 2 +- 6 files changed, 35 insertions(+), 53 deletions(-) diff --git a/.build/generated/requirements-deptree.md b/.build/generated/requirements-deptree.md index 5db6d400a..39861acba 100644 --- a/.build/generated/requirements-deptree.md +++ b/.build/generated/requirements-deptree.md @@ -69,7 +69,7 @@ imdbpie 5.6.4.dev0 Python IMDB client using the IMDB json web service made avail | `-- urllib3 >=1.21.1,<1.27 |-- six >=1.0.0 `-- trans >=2.1.0 -importlib-metadata 4.8.1 Read metadata from Python packages +importlib-metadata 4.2.0 Read metadata from Python packages |-- typing-extensions >=3.6.4 `-- zipp >=0.5 jsonpickle 2.0.0 Python library for serializing any arbitrary object graph into JSON diff --git a/.build/generated/requirements-imported.md b/.build/generated/requirements-imported.md index 56469b6f8..781572d85 100644 --- a/.build/generated/requirements-imported.md +++ b/.build/generated/requirements-imported.md @@ -46,12 +46,12 @@ enzyme == 0.4.1 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\notifiers\growl.py: 5 gntp == 1.0.3 -# C:\Tools\GitHub\Auto-Subliminal\autosubliminal\__init__.py: 593 +# C:\Tools\GitHub\Auto-Subliminal\autosubliminal\__init__.py: 617 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\fileprocessor.py: 7 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\parsers\guessit\__init__.py: 3 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\parsers\guessit\rules.py: 3,4,5 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\providers\addic7ed_custom.py: 9 -guessit == 3.3.1 +guessit == 3.4.2 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\core\movie.py: 7 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\indexer.py: 9,10,11 @@ -60,7 +60,7 @@ imdbpie == 5.6.4.dev0 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\util\json.py: 4 jsonpickle == 2.0.0 -# C:\Tools\GitHub\Auto-Subliminal\autosubliminal\__init__.py: 662,663 +# C:\Tools\GitHub\Auto-Subliminal\autosubliminal\__init__.py: 686,687 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\util\filesystem.py: 9 langdetect == 1.0.9 @@ -77,7 +77,7 @@ python_dateutil == 2.8.2 python_twitter == 3.5 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\parsers\guessit\rules.py: 8 -rebulk == 3.0.1 +rebulk == 3.1.0 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\core\cache.py: 8 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\notifiers\prowl.py: 5 @@ -95,10 +95,10 @@ requests_oauthlib == 1.3.0 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\core\websocket.py: 8 schema == 0.7.4 -# C:\Tools\GitHub\Auto-Subliminal\autosubliminal\__init__.py: 4 +# C:\Tools\GitHub\Auto-Subliminal\autosubliminal\__init__.py: 5 setuptools == 58.5.3 -# C:\Tools\GitHub\Auto-Subliminal\autosubliminal\__init__.py: 630 +# C:\Tools\GitHub\Auto-Subliminal\autosubliminal\__init__.py: 654 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\providers\addic7ed_custom.py: 17,18 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\providers\exceptions.py: 3 # C:\Tools\GitHub\Auto-Subliminal\autosubliminal\providers\pitcher.py: 11 diff --git a/.build/generated/requirements.md b/.build/generated/requirements.md index 95ae02f3a..7e68be094 100644 --- a/.build/generated/requirements.md +++ b/.build/generated/requirements.md @@ -29,7 +29,7 @@ guessit==3.4.2 html5lib==1.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") idna==3.3; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" imdbpie @ git+https://github.com/h3llrais3r/imdb-pie.git@75c300af1bf87c49baef09f17002a3e35b0ed3cc -importlib-metadata==4.8.1; python_version < "3.8" and python_version >= "3.6" or python_version < "3.8" +importlib-metadata==4.2.0; python_version < "3.8" and python_version >= "3.6" or python_version < "3.8" importlib-resources==5.4.0; python_version >= "3.6" and python_version < "3.9" jaraco.classes==3.2.1; python_version >= "3.6" jaraco.collections==3.4.0; python_version >= "3.6" diff --git a/poetry.lock b/poetry.lock index 1c87eafc1..425e250d8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -30,14 +30,14 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "autopep8" -version = "1.5.7" +version = "1.6.0" description = "A tool that automatically formats Python code to conform to the PEP 8 style guide" category = "dev" optional = false python-versions = "*" [package.dependencies] -pycodestyle = ">=2.7.0" +pycodestyle = ">=2.8.0" toml = "*" [[package]] @@ -253,17 +253,17 @@ python-versions = "*" [[package]] name = "flake8" -version = "3.9.2" +version = "4.0.1" description = "the modular source code checker: pep8 pyflakes and co" category = "dev" optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" +python-versions = ">=3.6" [package.dependencies] -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} +importlib-metadata = {version = "<4.3", markers = "python_version < \"3.8\""} mccabe = ">=0.6.0,<0.7.0" -pycodestyle = ">=2.7.0,<2.8.0" -pyflakes = ">=2.3.0,<2.4.0" +pycodestyle = ">=2.8.0,<2.9.0" +pyflakes = ">=2.4.0,<2.5.0" [[package]] name = "future" @@ -374,7 +374,7 @@ resolved_reference = "75c300af1bf87c49baef09f17002a3e35b0ed3cc" [[package]] name = "importlib-metadata" -version = "4.8.1" +version = "4.2.0" description = "Read metadata from Python packages" category = "main" optional = false @@ -386,8 +386,7 @@ zipp = ">=0.5" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -perf = ["ipython"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] [[package]] name = "importlib-resources" @@ -678,15 +677,15 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "pycodestyle" -version = "2.7.0" +version = "2.8.0" description = "Python style guide checker" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "pyflakes" -version = "2.3.1" +version = "2.4.0" description = "passive checker of Python programs" category = "dev" optional = false @@ -741,18 +740,6 @@ toml = "*" [package.extras] testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] -[[package]] -name = "pytest-flake8" -version = "1.0.7" -description = "pytest plugin to check FLAKE8 requirements" -category = "dev" -optional = false -python-versions = "*" - -[package.dependencies] -flake8 = ">=3.5" -pytest = ">=3.5" - [[package]] name = "pytest-mock" version = "3.6.1" @@ -1174,7 +1161,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [metadata] lock-version = "1.1" python-versions = ">=3.6,<4" -content-hash = "f9f7416048929c83a1fa2e64f8e890fa03ee2676755671dd2172920f74aecc2c" +content-hash = "fc106e228c8a5b257d9c57983de5696f709c80d52178f1a54a53d9eb8478da9a" [metadata.files] appdirs = [ @@ -1190,8 +1177,8 @@ attrs = [ {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, ] autopep8 = [ - {file = "autopep8-1.5.7-py2.py3-none-any.whl", hash = "sha256:aa213493c30dcdac99537249ee65b24af0b2c29f2e83cd8b3f68760441ed0db9"}, - {file = "autopep8-1.5.7.tar.gz", hash = "sha256:276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0"}, + {file = "autopep8-1.6.0-py2.py3-none-any.whl", hash = "sha256:ed77137193bbac52d029a52c59bec1b0629b5a186c495f1eb21b126ac466083f"}, + {file = "autopep8-1.6.0.tar.gz", hash = "sha256:44f0932855039d2c15c4510d6df665e4730f2b8582704fa48f9c55bd3e17d979"}, ] babelfish = [ {file = "babelfish-0.6.0-py3-none-any.whl", hash = "sha256:268f1c6279f2a04a66837972e8a9f3dcc68e16f1201eec57d2a4b828a8b41b11"}, @@ -1312,8 +1299,8 @@ enzyme = [ {file = "enzyme-0.4.1.tar.gz", hash = "sha256:f2167fa97c24d1103a94d4bf4eb20f00ca76c38a37499821049253b2059c62bb"}, ] flake8 = [ - {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"}, - {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"}, + {file = "flake8-4.0.1-py2.py3-none-any.whl", hash = "sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d"}, + {file = "flake8-4.0.1.tar.gz", hash = "sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d"}, ] future = [ {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, @@ -1345,8 +1332,8 @@ idna = [ ] imdbpie = [] importlib-metadata = [ - {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"}, - {file = "importlib_metadata-4.8.1.tar.gz", hash = "sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1"}, + {file = "importlib_metadata-4.2.0-py3-none-any.whl", hash = "sha256:057e92c15bc8d9e8109738a48db0ccb31b4d9d5cfbee5a8670879a30be66304b"}, + {file = "importlib_metadata-4.2.0.tar.gz", hash = "sha256:b7e52a1f8dec14a75ea73e0891f3060099ca1d8e6a462a4dff11c3e119ea1b31"}, ] importlib-resources = [ {file = "importlib_resources-5.4.0-py3-none-any.whl", hash = "sha256:33a95faed5fc19b4bc16b29a6eeae248a3fe69dd55d4d229d2b480e23eeaad45"}, @@ -1511,12 +1498,12 @@ py = [ {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"}, ] pycodestyle = [ - {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"}, - {file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"}, + {file = "pycodestyle-2.8.0-py2.py3-none-any.whl", hash = "sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20"}, + {file = "pycodestyle-2.8.0.tar.gz", hash = "sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f"}, ] pyflakes = [ - {file = "pyflakes-2.3.1-py2.py3-none-any.whl", hash = "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3"}, - {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"}, + {file = "pyflakes-2.4.0-py2.py3-none-any.whl", hash = "sha256:3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e"}, + {file = "pyflakes-2.4.0.tar.gz", hash = "sha256:05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c"}, ] pyparsing = [ {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, @@ -1552,10 +1539,6 @@ pytest = [ {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"}, {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"}, ] -pytest-flake8 = [ - {file = "pytest-flake8-1.0.7.tar.gz", hash = "sha256:f0259761a903563f33d6f099914afef339c085085e643bee8343eb323b32dd6b"}, - {file = "pytest_flake8-1.0.7-py2.py3-none-any.whl", hash = "sha256:c28cf23e7d359753c896745fd4ba859495d02e16c84bac36caa8b1eec58f5bc1"}, -] pytest-mock = [ {file = "pytest-mock-3.6.1.tar.gz", hash = "sha256:40217a058c52a63f1042f0784f62009e976ba824c418cced42e88d5f40ab0e62"}, {file = "pytest_mock-3.6.1-py3-none-any.whl", hash = "sha256:30c2f2cc9759e76eee674b81ea28c9f0b94f8f0445a1b87762cadf774f0df7e3"}, diff --git a/pyproject.toml b/pyproject.toml index 96e7961ee..51bc4bd41 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,7 @@ gntp = "1.0.3" guessit = "3.4.2" html5lib = "1.1" imdbpie = { git = "https://github.com/h3llrais3r/imdb-pie.git", rev = "75c300af1bf87c49baef09f17002a3e35b0ed3cc" } -importlib-metadata = { version = "4.8.1", markers = "python_version < '3.8'" } +importlib-metadata = { version = "4.2.0", markers = "python_version < '3.8'" } jsonpickle = "2.0.0" langdetect = "1.0.9" pysrt = "1.1.2" @@ -64,14 +64,13 @@ ws4py = "0.5.1" coverage = "6.1.2" coveralls = "3.3.1" pytest = "6.2.5" -pytest-flake8 = "1.0.7" pytest-mock = "3.6.1" requests-mock = "1.9.3" vcrpy = "4.1.1" # Tooling -autopep8 = "1.5.7" -flake8 = "3.9.2" +autopep8 = "1.6.0" +flake8 = "4.0.1" isort = "5.8.0" pigar = "0.10.0" diff --git a/requirements.txt b/requirements.txt index 5689cd985..e461a3770 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ guessit==3.4.2 html5lib==1.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") idna==3.3; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" imdbpie @ git+https://github.com/h3llrais3r/imdb-pie.git@75c300af1bf87c49baef09f17002a3e35b0ed3cc -importlib-metadata==4.8.1; python_version < "3.8" and python_version >= "3.6" or python_version < "3.8" +importlib-metadata==4.2.0; python_version < "3.8" and python_version >= "3.6" or python_version < "3.8" importlib-resources==5.4.0; python_version >= "3.6" and python_version < "3.9" jaraco.classes==3.2.1; python_version >= "3.6" jaraco.collections==3.4.0; python_version >= "3.6"