From c24e989eea3a4498c0364bca6a55ea0a13afd8ee Mon Sep 17 00:00:00 2001 From: sharkykh Date: Sun, 5 May 2019 15:41:47 +0300 Subject: [PATCH] Update requirements (#6628) * Update dependency lists: - Remove `oauth2` from `requirements.txt` - Fix `adba` commit - Fix `cfscrape` package name - Fix `subliminal` commit - Fix `deluge-client` module - Add markers for some dependencies * Update `_check_python_version` to disallow `< 3.5` * Better requirement URLs for github deps Use `tar.gz` archives from `codeload.github.com` instead of git. Should be faster and lighter. * Reorder columns (remove `Status`) * Sort lists by package name * Move all packages for Python < 3.5 into `ext2`: - Move `singledispatch` to `ext2` Anything for Python versions below 3.4 is Python 2.7 in our case - Move `backports_abc` to `ext2` Anything for Python versions below 3.5 is Python 2.7 in our case * Remove markers from list Use `folder` to apply markers when generating `requirements.txt` * Update `requirements.txt` based off of list To only contain: - Packages directly imported/used by `medusa` - Git dependencies * Remove unreachable code See `medusa/init/__init__.py`: `_check_python_version` executes first * Fix `validators` version --- SickBeard.py | 5 - ext/readme.md | 142 ++++++++++++------------ {ext => ext2}/backports_abc.py | 0 {ext => ext2}/singledispatch.py | 0 {ext => ext2}/singledispatch_helpers.py | 0 lib/readme.md | 32 +++--- medusa/init/__init__.py | 4 +- requirements.txt | 26 ++--- start.py | 5 - 9 files changed, 100 insertions(+), 114 deletions(-) rename {ext => ext2}/backports_abc.py (100%) rename {ext => ext2}/singledispatch.py (100%) rename {ext => ext2}/singledispatch_helpers.py (100%) diff --git a/SickBeard.py b/SickBeard.py index 286a33c45f..a4f96f943d 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -3,12 +3,7 @@ """Script for backwards compatibility.""" from __future__ import unicode_literals -import sys - from medusa.__main__ import main if __name__ == '__main__': - if sys.version_info.major == 3 and sys.version_info.minor < 5: - print('Medusa supports Python 2 from version 2.7.10 and Python 3 from version 3.5.0, exiting!') - raise Exception('Incorrect Python version. Shutting down!') main() diff --git a/ext/readme.md b/ext/readme.md index 43f02cd4f2..170c3b2d18 100644 --- a/ext/readme.md +++ b/ext/readme.md @@ -1,75 +1,75 @@ ## ext - Status | Package | Version / Commit | Usage | Folder | Notes -:------: | :-------: | :----------------: | :---- | :--: | :---- -:: | `adba` | pymedusa/[6502307](https://github.com/pymedusa/adba/tree/6502307ae34286e44b28234cfbacee6df1eadf07) | **`medusa`** | ext | - -:: | appdirs.py | [1.4.3](https://pypi.org/project/appdirs/1.4.3/) | `subliminal` (cli only), `simpleanidb` | ext | - -:: | `attrs` | [18.2.0](https://pypi.org/project/attrs/18.2.0/) | `imdbpie` | ext | Module: `attr` -:: | `babelfish` | [f403000](https://github.com/Diaoul/babelfish/tree/f403000dd63092cfaaae80be9f309fd85c7f20c9) | **`medusa`**, `guessit`, `knowit`, `subliminal` | ext | - -:: | `backports.functools_lru_cache` | [1.5](https://pypi.org/project/backports.functools_lru_cache/1.5/) | `soupsieve` | **ext2** | - -:: | backports_abc.py | [0.5](https://pypi.org/project/backports_abc/0.5/) | `tornado` | ext | Markers: `python_version < '3.5'` -:: | `beautifulsoup4` | [4.7.1](https://pypi.org/project/beautifulsoup4/4.7.1/) | **`medusa`**, `subliminal` | **ext2 ext3** | Module: `bs4` -:: | `bencode.py` | [2.0.0](https://pypi.org/project/bencode.py/2.0.0/) | **`medusa`** | ext | Module: `bencode` -:: | `boto` | [2.48.0](https://pypi.org/project/boto/2.48.0/) | `imdbpie` | ext | - -:: | `CacheControl` | [0.12.5](https://pypi.org/project/CacheControl/0.12.5/) | **`medusa`** | ext | Module: `cachecontrol` -:: | `certifi` | [2019.3.9](https://pypi.org/project/certifi/2019.3.9/) | **`medusa`**, `traktor`, `requests` | ext | - -:: | `chardet` | [3.0.4](https://pypi.org/project/chardet/3.0.4/) | **`medusa`**, `beautifulsoup4`, `feedparser`, `html5lib`, `pysrt`, `requests`, `subliminal` | ext | - -:: | `cloudflare-scrape` | pymedusa/[1354751](https://github.com/pymedusa/cloudflare-scrape/tree/1354751d5efd9353ad837d83941ed6b3f4488c77) | **`medusa`** | ext | Module: `cfscrape` -:: | configobj.py
`validate.py`
`_version.py` | [5.0.6](https://pypi.org/project/configobj/5.0.6/) | **`medusa`** | ext | - -:: | configparser.py
`backports.configparser` | [3.7.4](https://pypi.org/project/configparser/3.7.4/) | `adba` | **ext2** | - -:: | contextlib2.py | [0.5.5](https://pypi.org/project/contextlib2/0.5.5/) | **`medusa`**, `tvdbapiv2` | ext | Markers: `python_version < '3.5'` -:: | decorator.py | [4.4.0](https://pypi.org/project/decorator/4.4.0/) | `dogpile.cache`, `validators` | ext | - -:: | `deluge-client` | [1.7.1](https://pypi.org/project/deluge-client/1.7.1/) | **`medusa`** | ext | - -:: | `deprecated` | [1.2.3](https://pypi.org/project/deprecated/1.2.3/) | `PyGithub` | ext | - -:: | `dirtyjson` | [1.0.7](https://pypi.org/project/dirtyjson/1.0.7/) | **`medusa`** | ext | - -:: | `diskcache` | [2.9.0](https://pypi.org/project/diskcache/2.9.0/) | `imdbpie` | ext | - -:: | `dogpile.cache` | [0.7.1](https://pypi.org/project/dogpile.cache/0.7.1/) | **`medusa`**, `subliminal` | ext | - -:: | `enum34` | [1.1.6](https://pypi.org/project/enum34/1.1.6/) | **`medusa`** | **ext2** | Module: `enum`
Backport from Python 3.4 -:: | `enzyme` | pymedusa/[665cf69](https://github.com/pymedusa/enzyme/tree/665cf6948aab1c249dcc99bd9624a81d17b3302a) | `knowit`, `subliminal` | ext | - -:: | `feedparser` | [2b11c80](https://github.com/kurtmckee/feedparser/tree/2b11c8028321ed43cbaf313f83b0c94820143d66) | **`medusa`** | ext | Requires `sgmllib3k` on Python 3 -:: | **`future`**
`_dummy_thread`
`_markupbase`
`_thread`
`builtins`
`copyreg`
`html`
`http`
`libfuturize`
`libpasteurize`
`past`
`queue`
`reprlib`
`socketserver`
`tkinter`
`winreg`
`xmlrpc` | [0.17.1](https://pypi.org/project/future/0.17.1/) | **`medusa`**, `python-twitter`, ????? | **ext2** | - -:: | `futures` | [3.2.0](https://pypi.org/project/futures/3.2.0/) | **`medusa`**, `subliminal`, `tornado` | **ext2** | Module: `concurrent.futures`
Markers: `python_version >= '2.6' and python_version < '3'` -:: | `PyGithub` | [1.43.7](https://pypi.org/project/PyGithub/1.43.7/) | **`medusa`** | **ext2 ext3** | Module: `github` -:: | `gntp` | [1.0.3](https://pypi.org/project/gntp/1.0.3/) | **`medusa`** | ext | - -:: | `guessit` | [74dbb0c](https://github.com/guessit-io/guessit/tree/74dbb0c7420cee18969926aba9cc06b8959daa0e) | **`medusa`**, `subliminal` | ext | - -:: | `html5lib` | [1.0.1](https://pypi.org/project/html5lib/1.0.1/) | **`medusa`** (via `beautifulsoup4`) | ext | - -:: | `idna` | [2.8](https://pypi.org/project/idna/2.8/) | `requests` | ext | - -:: | `imdbpie` | [5.6.3](https://pypi.org/project/imdbpie/5.6.3/) | **`medusa`** | ext | - -:: | `Js2Py` | [0.59](https://pypi.org/project/Js2Py/0.59/) | `cloudflare-scrape` | ext | Module: `js2py` -:: | `jsonrpclib-pelix` | [0.4.0](https://pypi.org/project/jsonrpclib-pelix/0.4.0/) | **`medusa`** | ext | Module: `jsonrpclib` -:: | `PyJWT` | [1.7.1](https://pypi.org/project/pyjwt/1.7.1/) | **`medusa`**, `PyGithub`, `tvdbapiv2` | ext | Module: `jwt` -:: | `knowit` | [0.2.4](https://pypi.org/project/knowit/0.2.4/) | **`medusa`** | ext | - -:: | `lockfile` | [0.12.2](https://pypi.org/project/lockfile/0.12.2/) | `CacheControl` | ext | - -:: | `Mako` | [1.0.9](https://pypi.org/project/Mako/1.0.9/) | **`medusa`** | ext | Module: `mako` -:: | markdown2.py | [2.3.7](https://pypi.org/project/markdown2/2.3.7/) | **`medusa`** | ext | - -:: | `MarkupSafe` | [1.1.1](https://pypi.org/project/MarkupSafe/1.1.1/) | `Mako` | ext | Module: `markupsafe` -:: | `msgpack` | [0.5.6](https://pypi.org/project/msgpack/0.5.6/) | `CacheControl` | ext | - -:: | `oauthlib` | [3.0.0](https://pypi.org/project/oauthlib/3.0.0/) | `requests-oauthlib` | ext | - -:: | `Pint` | [0.8.1](https://pypi.org/project/Pint/0.8.1/) | `knowit` | ext | Module: `pint` -:: | profilehooks.py | [1.11.0](https://pypi.org/project/profilehooks/1.11.0/) | **`medusa`** | ext | - -:: | `pyjsparser` | [2.5.2](https://pypi.org/project/pyjsparser/2.5.2/) | `Js2Py` | ext | - -:: | `pysrt` | [1.1.0](https://pypi.org/project/pysrt/1.1.0/) | `subliminal` | ext | - -:: | `python-dateutil` | [2.8.0](https://pypi.org/project/python-dateutil/2.8.0/) | **`medusa`**, `tvdbapiv2`, `guessit`, `imdbpie` | ext | Module: `dateutil` -:: | `python-twitter` | [3.5](https://pypi.org/project/python-twitter/3.5/) | **`medusa`** | ext | Module: `twitter` -:: | `pytz` | [2018.4](https://pypi.org/project/pytz/2018.4/) | `subliminal`, `tzlocal` | ext | - -:: | rarfile.py | [3.0](https://pypi.org/project/rarfile/3.0/) | **`medusa`**, `subliminal` | ext | - -:: | `rebulk` | [1.0.0](https://pypi.org/project/rebulk/1.0.0/) | **`medusa`**, `guessit` | ext | - -:: | `requests` | [2.21.0](https://pypi.org/project/requests/2.21.0/) | **`medusa`**, `adba`, `pytvmaze`, `simpleanidb`, `tmdbsimple`, `traktor`, `tvdbapiv2`, `boto`, `rtorrent`, `CacheControl`, `cloudflare-scrape`, `subliminal`, `PyGithub`, `python-twitter` | ext | - -:: | `requests-oauthlib` | [1.2.0](https://pypi.org/project/requests-oauthlib/1.2.0/) | **`medusa`**, `python-twitter` | ext | Module: `requests_oauthlib` -:: | sgmllib3k | [1.0.0](https://pypi.org/project/sgmllib3k/1.0.0/) | `feedparser` | **ext3** | File: `sgmllib.py` -:: | singledispatch.py
`singledispatch_helpers.py` | [3.4.0.3](https://pypi.org/project/singledispatch/3.4.0.3/) | `tornado` | ext | Markers: `python_version < '3.4'` -:: | six.py | [1.12.0](https://pypi.org/project/six/1.12.0/) | **`medusa`**, `tvdbapiv2`, `configobj`, `python-dateutil`, `guessit`, `html5lib`, `imdbpie`, `Js2Py`, `knowit`, `rebulk`, `subliminal`, `validators` | ext | - -:: | `soupsieve` | [1.7](https://pypi.org/project/soupsieve/1.7/) | `beautifulsoup4` | ext | - -:: | `stevedore` | [1.30.1](https://pypi.org/project/stevedore/1.30.1/) | `subliminal` | ext | - -:: | `subliminal` | [6ac2fa23](https://github.com/Diaoul/subliminal/tree/6ac2fa23ee5baa7d8452552edaa7c4a8a00d237a) | **`medusa`** | ext | - -:: | `tornado` | [5.1.1](https://pypi.org/project/tornado/5.1.1/) | **`medusa`**, `tornroutes` | ext | - -:: | `tornroutes` | [0.5.1](https://pypi.org/project/tornroutes/0.5.1/) | **`medusa`** | ext | - -:: | `trans` | [2.1.0](https://pypi.org/project/trans/2.1.0/) | `imdbpie` | ext | - -:: | `tzlocal` | [1.5.1](https://pypi.org/project/tzlocal/1.5.1/) | `Js2Py` | ext | - -:: | `urllib3` | [1.24.1](https://pypi.org/project/urllib3/1.24.1/) | `requests`, `CacheControl` | ext | - -:: | `validators` | [0.12.5](https://pypi.org/project/validators/0.12.5/) | **`medusa`** | ext | - -:: | `webencodings` | [0.5.1](https://pypi.org/project/webencodings/0.5.1/) | `html5lib` | ext | - -:: | `wrapt` | [1.10.11](https://pypi.org/project/wrapt/1.10.11/) | `deprecated` | ext | - -:: | `PyYAML` | [5.1](https://pypi.org/project/PyYAML/5.1/) | `knowit` | **ext2 ext3** | Module: `yaml` + Folder | Package | Version / Commit | Usage | Notes +:------: | :-------: | :----------------: | :---- | :---- +ext | `adba` | pymedusa/[4d7388c](https://github.com/pymedusa/adba/tree/4d7388c815ee7f54c5479028bd1435083403a18c) | **`medusa`** | - +ext | appdirs.py | [1.4.3](https://pypi.org/project/appdirs/1.4.3/) | `subliminal` (cli only), `simpleanidb` | - +ext | `attrs` | [18.2.0](https://pypi.org/project/attrs/18.2.0/) | `imdbpie` | Module: `attr` +ext | `babelfish` | [f403000](https://github.com/Diaoul/babelfish/tree/f403000dd63092cfaaae80be9f309fd85c7f20c9) | **`medusa`**, `guessit`, `knowit`, `subliminal` | - +**ext2** | `backports.functools_lru_cache` | [1.5](https://pypi.org/project/backports.functools_lru_cache/1.5/) | `soupsieve` | - +**ext2** | backports_abc.py | [0.5](https://pypi.org/project/backports_abc/0.5/) | `tornado` | - +**ext2 ext3** | `beautifulsoup4` | [4.7.1](https://pypi.org/project/beautifulsoup4/4.7.1/) | **`medusa`**, `subliminal` | Module: `bs4` +ext | `bencode.py` | [2.0.0](https://pypi.org/project/bencode.py/2.0.0/) | **`medusa`** | Module: `bencode` +ext | `boto` | [2.48.0](https://pypi.org/project/boto/2.48.0/) | `imdbpie` | - +ext | `CacheControl` | [0.12.5](https://pypi.org/project/CacheControl/0.12.5/) | **`medusa`** | Module: `cachecontrol` +ext | `certifi` | [2019.3.9](https://pypi.org/project/certifi/2019.3.9/) | **`medusa`**, `traktor`, `requests` | - +ext | `cfscrape` | pymedusa/[1354751](https://github.com/pymedusa/cloudflare-scrape/tree/1354751d5efd9353ad837d83941ed6b3f4488c77) | **`medusa`** | - +ext | `chardet` | [3.0.4](https://pypi.org/project/chardet/3.0.4/) | **`medusa`**, `beautifulsoup4`, `feedparser`, `html5lib`, `pysrt`, `requests`, `subliminal` | - +ext | configobj.py
`validate.py`
`_version.py` | [5.0.6](https://pypi.org/project/configobj/5.0.6/) | **`medusa`** | - +**ext2** | configparser.py
`backports.configparser` | [3.7.4](https://pypi.org/project/configparser/3.7.4/) | `adba` | - +ext | contextlib2.py | [0.5.5](https://pypi.org/project/contextlib2/0.5.5/) | **`medusa`**, `tvdbapiv2` | - +ext | decorator.py | [4.4.0](https://pypi.org/project/decorator/4.4.0/) | `dogpile.cache`, `validators` | - +ext | `deluge-client` | [1.7.1](https://pypi.org/project/deluge-client/1.7.1/) | **`medusa`** | Module: `deluge_client` +ext | `deprecated` | [1.2.3](https://pypi.org/project/deprecated/1.2.3/) | `PyGithub` | - +ext | `dirtyjson` | [1.0.7](https://pypi.org/project/dirtyjson/1.0.7/) | **`medusa`** | - +ext | `diskcache` | [2.9.0](https://pypi.org/project/diskcache/2.9.0/) | `imdbpie` | - +ext | `dogpile.cache` | [0.7.1](https://pypi.org/project/dogpile.cache/0.7.1/) | **`medusa`**, `subliminal` | - +**ext2** | `enum34` | [1.1.6](https://pypi.org/project/enum34/1.1.6/) | **`medusa`** | Module: `enum` +ext | `enzyme` | pymedusa/[665cf69](https://github.com/pymedusa/enzyme/tree/665cf6948aab1c249dcc99bd9624a81d17b3302a) | `knowit`, `subliminal` | - +ext | `feedparser` | [2b11c80](https://github.com/kurtmckee/feedparser/tree/2b11c8028321ed43cbaf313f83b0c94820143d66) | **`medusa`** | Requires `sgmllib3k` on Python 3 +**ext2** | **`future`**
`_dummy_thread`
`_markupbase`
`_thread`
`builtins`
`copyreg`
`html`
`http`
`libfuturize`
`libpasteurize`
`past`
`queue`
`reprlib`
`socketserver`
`tkinter`
`winreg`
`xmlrpc` | [0.17.1](https://pypi.org/project/future/0.17.1/) | **`medusa`**, `python-twitter`, ????? | - +**ext2** | `futures` | [3.2.0](https://pypi.org/project/futures/3.2.0/) | **`medusa`**, `subliminal`, `tornado` | Module: `concurrent.futures` +ext | `gntp` | [1.0.3](https://pypi.org/project/gntp/1.0.3/) | **`medusa`** | - +ext | `guessit` | [74dbb0c](https://github.com/guessit-io/guessit/tree/74dbb0c7420cee18969926aba9cc06b8959daa0e) | **`medusa`**, `subliminal` | - +ext | `html5lib` | [1.0.1](https://pypi.org/project/html5lib/1.0.1/) | **`medusa`** (via `beautifulsoup4`) | - +ext | `idna` | [2.8](https://pypi.org/project/idna/2.8/) | `requests` | - +ext | `imdbpie` | [5.6.3](https://pypi.org/project/imdbpie/5.6.3/) | **`medusa`** | - +ext | `Js2Py` | [0.59](https://pypi.org/project/Js2Py/0.59/) | `cloudflare-scrape` | Module: `js2py` +ext | `jsonrpclib-pelix` | [0.4.0](https://pypi.org/project/jsonrpclib-pelix/0.4.0/) | **`medusa`** | Module: `jsonrpclib` +ext | `knowit` | [0.2.4](https://pypi.org/project/knowit/0.2.4/) | **`medusa`** | - +ext | `lockfile` | [0.12.2](https://pypi.org/project/lockfile/0.12.2/) | `CacheControl` | - +ext | `Mako` | [1.0.9](https://pypi.org/project/Mako/1.0.9/) | **`medusa`** | Module: `mako` +ext | markdown2.py | [2.3.7](https://pypi.org/project/markdown2/2.3.7/) | **`medusa`** | - +ext | `MarkupSafe` | [1.1.1](https://pypi.org/project/MarkupSafe/1.1.1/) | `Mako` | Module: `markupsafe` +ext | `msgpack` | [0.5.6](https://pypi.org/project/msgpack/0.5.6/) | `CacheControl` | - +ext | `oauthlib` | [3.0.0](https://pypi.org/project/oauthlib/3.0.0/) | `requests-oauthlib` | - +ext | `Pint` | [0.8.1](https://pypi.org/project/Pint/0.8.1/) | `knowit` | Module: `pint` +ext | profilehooks.py | [1.11.0](https://pypi.org/project/profilehooks/1.11.0/) | **`medusa`** | - +**ext2 ext3** | `PyGithub` | [1.43.7](https://pypi.org/project/PyGithub/1.43.7/) | **`medusa`** | Module: `github` +ext | `pyjsparser` | [2.5.2](https://pypi.org/project/pyjsparser/2.5.2/) | `Js2Py` | - +ext | `PyJWT` | [1.7.1](https://pypi.org/project/pyjwt/1.7.1/) | **`medusa`**, `PyGithub`, `tvdbapiv2` | Module: `jwt` +ext | `pysrt` | [1.1.0](https://pypi.org/project/pysrt/1.1.0/) | `subliminal` | - +ext | `python-dateutil` | [2.8.0](https://pypi.org/project/python-dateutil/2.8.0/) | **`medusa`**, `tvdbapiv2`, `guessit`, `imdbpie` | Module: `dateutil` +ext | `python-twitter` | [3.5](https://pypi.org/project/python-twitter/3.5/) | **`medusa`** | Module: `twitter` +ext | `pytz` | [2018.4](https://pypi.org/project/pytz/2018.4/) | `subliminal`, `tzlocal` | - +**ext2 ext3** | `PyYAML` | [5.1](https://pypi.org/project/PyYAML/5.1/) | `knowit` | Module: `yaml` +ext | rarfile.py | [3.0](https://pypi.org/project/rarfile/3.0/) | **`medusa`**, `subliminal` | - +ext | `rebulk` | [1.0.0](https://pypi.org/project/rebulk/1.0.0/) | **`medusa`**, `guessit` | - +ext | `requests` | [2.21.0](https://pypi.org/project/requests/2.21.0/) | **`medusa`**, `adba`, `pytvmaze`, `simpleanidb`, `tmdbsimple`, `traktor`, `tvdbapiv2`, `boto`, `rtorrent`, `CacheControl`, `cloudflare-scrape`, `subliminal`, `PyGithub`, `python-twitter` | - +ext | `requests-oauthlib` | [1.2.0](https://pypi.org/project/requests-oauthlib/1.2.0/) | **`medusa`**, `python-twitter` | Module: `requests_oauthlib` +**ext3** | sgmllib3k | [1.0.0](https://pypi.org/project/sgmllib3k/1.0.0/) | `feedparser` | File: `sgmllib.py` +**ext2** | singledispatch.py
`singledispatch_helpers.py` | [3.4.0.3](https://pypi.org/project/singledispatch/3.4.0.3/) | `tornado` | - +ext | six.py | [1.12.0](https://pypi.org/project/six/1.12.0/) | **`medusa`**, `tvdbapiv2`, `configobj`, `python-dateutil`, `guessit`, `html5lib`, `imdbpie`, `Js2Py`, `knowit`, `rebulk`, `subliminal`, `validators` | - +ext | `soupsieve` | [1.7](https://pypi.org/project/soupsieve/1.7/) | `beautifulsoup4` | - +ext | `stevedore` | [1.30.1](https://pypi.org/project/stevedore/1.30.1/) | `subliminal` | - +ext | `subliminal` | [6ac2fa2](https://github.com/Diaoul/subliminal/tree/6ac2fa23ee5baa7d8452552edaa7c4a8a00d237a) | **`medusa`** | - +ext | `tornado` | [5.1.1](https://pypi.org/project/tornado/5.1.1/) | **`medusa`**, `tornroutes` | - +ext | `tornroutes` | [0.5.1](https://pypi.org/project/tornroutes/0.5.1/) | **`medusa`** | - +ext | `trans` | [2.1.0](https://pypi.org/project/trans/2.1.0/) | `imdbpie` | - +ext | `tzlocal` | [1.5.1](https://pypi.org/project/tzlocal/1.5.1/) | `Js2Py` | - +ext | `urllib3` | [1.24.1](https://pypi.org/project/urllib3/1.24.1/) | `requests`, `CacheControl` | - +ext | `validators` | [0.12.5](https://pypi.org/project/validators/0.12.5/) | **`medusa`** | - +ext | `webencodings` | [0.5.1](https://pypi.org/project/webencodings/0.5.1/) | `html5lib` | - +ext | `wrapt` | [1.10.11](https://pypi.org/project/wrapt/1.10.11/) | `deprecated` | - Notes: - `ext` compatible with python2 and python3 diff --git a/ext/backports_abc.py b/ext2/backports_abc.py similarity index 100% rename from ext/backports_abc.py rename to ext2/backports_abc.py diff --git a/ext/singledispatch.py b/ext2/singledispatch.py similarity index 100% rename from ext/singledispatch.py rename to ext2/singledispatch.py diff --git a/ext/singledispatch_helpers.py b/ext2/singledispatch_helpers.py similarity index 100% rename from ext/singledispatch_helpers.py rename to ext2/singledispatch_helpers.py diff --git a/lib/readme.md b/lib/readme.md index 691b6b9603..c2951ee093 100644 --- a/lib/readme.md +++ b/lib/readme.md @@ -1,20 +1,20 @@ ## lib - Status | Package | Version / Commit | Usage | Folder | Notes -:------: | :-------: | :----------------: | :---- | :--: | :---- -:: | `certgen.py` | [d52975c](https://github.com/pyca/pyopenssl/blob/d52975cef3a36e18552aeb23de7c06aa73d76454/examples/certgen.py) | **`medusa`** | lib | **Not a package** -:: | `native` | - | `pymediainfo` | lib | **Not a package** -:: | `pkg_resources` | ????? | `babelfish`, `enzyme`, `guessit`, `stevedore`, `pint`, ... | lib | **Not a package**
Part of `setuptools` -:: | `pymediainfo` | [2.2.1](https://pypi.org/project/pymediainfo/2.2.1/) | `knowit` | lib | **Modified**: Version number fixed -:: | `pytimeparse` | [1.1.5](https://pypi.org/project/pytimeparse/1.1.5/) | **`medusa`** | lib | **Modified**: [#1792](https://github.com/pymedusa/Medusa/pull/1792) -:: | `pytvmaze` | [2.0.7](https://pypi.org/project/pytvmaze/2.0.7/) | **`medusa`** | lib | **Modified**: [#1706](https://github.com/pymedusa/Medusa/pull/1706) -:: | `rtorrent-python` | [0.2.9](https://pypi.org/project/rtorrent-python/0.2.9/) | **`medusa`** | lib | Module: `rtorrent`
**Modified**: [commit log](https://github.com/pymedusa/Medusa/commits/master/lib/rtorrent) -:: | `send2trash` | [1.5.0](https://pypi.org/project/Send2Trash/1.5.0/) | **`medusa`** | lib | **Modified**: Applied [hsoft/send2trash#33](https://github.com/hsoft/send2trash/pull/33) -:: | `shutil_custom` | - | **`medusa`** | lib | **Custom** -:: | `simpleanidb` | pymedusa/[5d26c8c](https://github.com/pymedusa/simpleanidb/tree/5d26c8c146891225c05651821ef34ced0c118221) | **`medusa`** | lib | - -:: | `tmdbsimple` | [2.2.0](https://pypi.org/project/tmdbsimple/2.2.0/) | **`medusa`** | lib | **Modified**: [#4026](https://github.com/pymedusa/Medusa/pull/4026) -- [Upstream PR](https://github.com/celiao/tmdbsimple/pull/52) -:: | `traktor` | - | **`medusa`** | lib | **Custom** -:: | `tvdbapiv2` | pymedusa/[3a51858](https://github.com/pymedusa/tvdbv2/tree/3a51858640cfcb960be635e91394cbce1d73e036) | **`medusa`** | lib | **Modified**: [Upstream PR](https://github.com/pymedusa/tvdbv2/pull/2) -:: | `pyUnRAR2` | [commit](https://github.com/kyegupov/py-unrar2/tree/186a4c1feb9ef3d96a2331f8fb3ebf88036e15e5) | **`medusa`** | lib | Module: `unrar2`
**Modified**: [#5096](https://github.com/pymedusa/Medusa/pull/5096)
`test.rar` is not part of the package
The `UnRARDLL` folder isn't installed through `pip` + Folder | Package | Version / Commit | Usage | Notes +:------: | :-------: | :----------------: | :---- | :---- +lib | `certgen.py` | [d52975c](https://github.com/pyca/pyopenssl/blob/d52975cef3a36e18552aeb23de7c06aa73d76454/examples/certgen.py) | **`medusa`** | **Not a package** +lib | `native` | - | `pymediainfo` | **Not a package** +lib | `pkg_resources` | ????? | `babelfish`, `enzyme`, `guessit`, `stevedore`, `pint`, ... | **Not a package**
Part of `setuptools` +lib | `pymediainfo` | [2.2.1](https://pypi.org/project/pymediainfo/2.2.1/) | `knowit` | **Modified**: Version number fixed +lib | `pytimeparse` | [1.1.5](https://pypi.org/project/pytimeparse/1.1.5/) | **`medusa`** | **Modified**: [#1792](https://github.com/pymedusa/Medusa/pull/1792) +lib | `pytvmaze` | [2.0.7](https://pypi.org/project/pytvmaze/2.0.7/) | **`medusa`** | **Modified**: [#1706](https://github.com/pymedusa/Medusa/pull/1706) +lib | `pyUnRAR2` | [commit](https://github.com/kyegupov/py-unrar2/tree/186a4c1feb9ef3d96a2331f8fb3ebf88036e15e5) | **`medusa`** | Module: `unrar2`
**Modified**: [#5096](https://github.com/pymedusa/Medusa/pull/5096)
`test.rar` is not part of the package
The `UnRARDLL` folder isn't installed through `pip` +lib | `rtorrent-python` | [0.2.9](https://pypi.org/project/rtorrent-python/0.2.9/) | **`medusa`** | Module: `rtorrent`
**Modified**: [commit log](https://github.com/pymedusa/Medusa/commits/master/lib/rtorrent) +lib | `send2trash` | [1.5.0](https://pypi.org/project/Send2Trash/1.5.0/) | **`medusa`** | **Modified**: Applied [hsoft/send2trash#33](https://github.com/hsoft/send2trash/pull/33) +lib | `shutil_custom` | - | **`medusa`** | **Custom** +lib | `simpleanidb` | pymedusa/[5d26c8c](https://github.com/pymedusa/simpleanidb/tree/5d26c8c146891225c05651821ef34ced0c118221) | **`medusa`** | - +lib | `tmdbsimple` | [2.2.0](https://pypi.org/project/tmdbsimple/2.2.0/) | **`medusa`** | **Modified**: [#4026](https://github.com/pymedusa/Medusa/pull/4026) -- [Upstream PR](https://github.com/celiao/tmdbsimple/pull/52) +lib | `traktor` | - | **`medusa`** | **Custom** +lib | `tvdbapiv2` | pymedusa/[3a51858](https://github.com/pymedusa/tvdbv2/tree/3a51858640cfcb960be635e91394cbce1d73e036) | **`medusa`** | **Modified**: [Upstream PR](https://github.com/pymedusa/tvdbv2/pull/2) Notes: - `lib` compatible with python2 and python3 diff --git a/medusa/init/__init__.py b/medusa/init/__init__.py index 434da9b779..9354ada478 100644 --- a/medusa/init/__init__.py +++ b/medusa/init/__init__.py @@ -40,8 +40,8 @@ def initialize(): def _check_python_version(): - if sys.version_info < (2, 7): - print('Sorry, requires Python 2.7.x') + if sys.version_info < (2, 7) or (3,) < sys.version_info < (3, 5): + print('Sorry, requires Python 2.7.x or Python 3.5 and above') sys.exit(1) diff --git a/requirements.txt b/requirements.txt index 307bc3972c..f85071837c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,32 +1,29 @@ -# No setup.py, unable to install using pip -# git+https://github.com/pymedusa/adba.git@6502307ae34286e44b28234cfbacee6df1eadf07#egg=adba -git+https://github.com/Diaoul/babelfish.git@f403000dd63092cfaaae80be9f309fd85c7f20c9#egg=babelfish +https://codeload.github.com/pymedusa/adba/tar.gz/4d7388c815ee7f54c5479028bd1435083403a18c#egg=adba +https://codeload.github.com/Diaoul/babelfish/tar.gz/f403000dd63092cfaaae80be9f309fd85c7f20c9#egg=babelfish beautifulsoup4==4.7.1 bencode.py==2.0.0 CacheControl==0.12.5 certifi==2019.3.9 +https://codeload.github.com/pymedusa/cloudflare-scrape/tar.gz/1354751d5efd9353ad837d83941ed6b3f4488c77#egg=cfscrape chardet==3.0.4 -git+https://github.com/pymedusa/cloudflare-scrape.git@1354751d5efd9353ad837d83941ed6b3f4488c77#egg=cfscrape configobj==5.0.6 -configparser==3.7.4 -contextlib2==0.5.5 ; python_version < '3.5' +contextlib2==0.5.5 deluge-client==1.7.1 dirtyjson==1.0.7 dogpile.cache==0.7.1 -git+https://github.com/pymedusa/enzyme.git@665cf6948aab1c249dcc99bd9624a81d17b3302a#egg=enzyme -git+https://github.com/kurtmckee/feedparser.git@2b11c8028321ed43cbaf313f83b0c94820143d66#egg=feedparser -future==0.17.1 -futures==3.2.0 ; python_version >= '2.6' and python_version < '3' +enum34==1.1.6 ; python_version == '2.*' +https://codeload.github.com/pymedusa/enzyme/tar.gz/665cf6948aab1c249dcc99bd9624a81d17b3302a#egg=enzyme +https://codeload.github.com/kurtmckee/feedparser/tar.gz/2b11c8028321ed43cbaf313f83b0c94820143d66#egg=feedparser +future==0.17.1 ; python_version == '2.*' +futures==3.2.0 ; python_version == '2.*' gntp==1.0.3 -git+https://github.com/guessit-io/guessit.git@74dbb0c7420cee18969926aba9cc06b8959daa0e#egg=guessit +https://codeload.github.com/guessit-io/guessit/tar.gz/74dbb0c7420cee18969926aba9cc06b8959daa0e#egg=guessit html5lib==1.0.1 imdbpie==5.6.3 jsonrpclib-pelix==0.4.0 knowit==0.2.4 -lockfile==0.12.2 Mako==1.0.9 markdown2==2.3.7 -git+https://github.com/joestump/python-oauth2.git@6689960ca23f79eccf9a25a39e93f6540f44ca23#egg=oauth2 profilehooks==1.11.0 PyGithub==1.43.7 PyJWT==1.7.1 @@ -37,8 +34,7 @@ rebulk==1.0.0 requests==2.21.0 requests-oauthlib==1.2.0 six==1.12.0 -stevedore==1.30.1 -git+https://github.com/Diaoul/subliminal.git@6ac2fa23ee5baa7d8452552edaa7c4a8a00d237a#egg=subliminal +https://codeload.github.com/Diaoul/subliminal/tar.gz/6ac2fa23ee5baa7d8452552edaa7c4a8a00d237a#egg=subliminal tornado==5.1.1 tornroutes==0.5.1 validators==0.12.5 diff --git a/start.py b/start.py index fb07c8d633..228f1b8db5 100755 --- a/start.py +++ b/start.py @@ -3,12 +3,7 @@ """Startup script.""" from __future__ import unicode_literals -import sys - from medusa.__main__ import main if __name__ == '__main__': - if sys.version_info.major == 3 and sys.version_info.minor < 5: - print('Medusa supports Python 2 from version 2.7.10 and Python 3 from version 3.5.0, exiting!') - raise Exception('Incorrect Python version. Shutting down!') main()