diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index 0d2f2a3..90781f7 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -16,5 +16,5 @@ jobs: tools tests --line-length=120 - --target-version=py35 + --target-version=py36 --check diff --git a/.travis.yml b/.travis.yml index e10744a..d4b79d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,6 @@ matrix: # On macOS we only test the semi-recent version that is included - os: linux language: python - python: "3.5" - - os: linux - language: python python: "3.6" - os: linux language: python diff --git a/INSTALL.txt b/INSTALL.txt index 3dcb29b..03c5dda 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -52,7 +52,7 @@ Specific guides to install from source are available for Windows and macOS: https://sabnzbd.org/wiki/installation/install-macos https://sabnzbd.org/wiki/installation/install-from-source-windows -Only Python 3.5 and above is supported. +Only Python 3.6 and above is supported. On Linux systems you need to install: par2 unrar unzip python3-setuptools python3-pip diff --git a/README.md b/README.md index 1daf88e..78ea296 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you want to know more you can head over to our website: https://sabnzbd.org. SABnzbd has a few dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages, then you likely already have all the needed dependencies. If not, here's what you're looking for: -- `python` (Python 3.5 and higher, often called `python3`) +- `python` (Python 3.6 and higher, often called `python3`) - Python modules listed in `requirements.txt` - `par2` (Multi-threaded par2 installation guide can be found [here](https://sabnzbd.org/wiki/installation/multicore-par2)) - `unrar` (make sure you get the "official" non-free version of unrar) diff --git a/SABnzbd.py b/SABnzbd.py index fce840e..a3f6af4 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -17,8 +17,8 @@ import sys -if sys.hexversion < 0x03050000: - print("Sorry, requires Python 3.5 or above") +if sys.hexversion < 0x03060000: + print("Sorry, requires Python 3.6 or above") print("You can read more at: https://sabnzbd.org/python3") sys.exit(1) @@ -1171,10 +1171,6 @@ def main(): sabnzbd.encoding.CODEPAGE, ) - # TODO: Remove after 3.1.0 - if sys.hexversion < 0x03060000: - logging.warning_helpful("Python 3.5 is end-of-life. SABnzbd 3.2.0 will only run on Python 3.6 and above.") - # SSL Information logging.info("SSL version = %s", ssl.OPENSSL_VERSION) diff --git a/sabnzbd/version.py b/sabnzbd/version.py index d0667ec..79b7c14 100644 --- a/sabnzbd/version.py +++ b/sabnzbd/version.py @@ -4,5 +4,5 @@ # You MUST use double quotes (so " and not ') -__version__ = "3.1.0-develop" +__version__ = "3.2.0-develop" __baseline__ = "unknown"