From b9dfeac2f3f446f8897490824b613e5776448baa Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Tue, 15 Mar 2022 05:09:58 -0500 Subject: [PATCH] Drop Python 3.6 Support --- .github/workflows/default.yml | 10 +++++----- .sonarcloud.properties | 2 +- README.md | 2 +- Windows.md | 4 ++-- build.py | 4 ++-- macos.md | 4 ++-- pkg/debian/control | 2 +- setup.cfg | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 16a66159..9c1bca1b 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -45,20 +45,20 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [3.6, 3.7, 3.8, 3.9, '3.10'] + python-version: [3.7, 3.8, 3.9, '3.10'] exclude: - - os: macos-latest - python-version: 3.6 - os: macos-latest python-version: 3.7 - os: macos-latest python-version: 3.8 - - os: windows-latest - python-version: 3.6 + - os: macos-latest + python-version: 3.9 - os: windows-latest python-version: 3.7 - os: windows-latest python-version: 3.8 + - os: windows-latest + python-version: 3.9 steps: - uses: actions/checkout@v2 diff --git a/.sonarcloud.properties b/.sonarcloud.properties index ef35e6ba..c8eecdf6 100644 --- a/.sonarcloud.properties +++ b/.sonarcloud.properties @@ -1 +1 @@ -sonar.python.version=3.6, 3.7, 3.8, 3.9, 3.10 \ No newline at end of file +sonar.python.version=3.7, 3.8, 3.9, 3.10 \ No newline at end of file diff --git a/README.md b/README.md index de0376fa..cc963749 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ For windows instructions see the [Windows Instructions](Windows.md). For macos instructions (qt version) see the [macOS Instructions](macos.md). ### Prerequisites -* [Python 3.6+][python] +* [Python 3.7+][python] * PyQt5 ### System Setup diff --git a/Windows.md b/Windows.md index 283d587f..13f60ae1 100644 --- a/Windows.md +++ b/Windows.md @@ -2,7 +2,7 @@ ### Prerequisites -- [Python 3.6+][python] +- [Python 3.7+][python] - [Visual Studio 2019][vs] or [Visual Studio Build Tools 2019][vsBuildTools] with the Windows 10 SDK - [nsis][nsis] (for installer creation) - [msys2][msys2] (for using makefile method) @@ -16,7 +16,7 @@ After installing python it is recommended to update setuptools before compiling More details on setting up python for compiling packages on windows can be found on the [python wiki][pythonWindowsCompilers] Take note of the required vc++ versions. ### With build.py (preferred) -To build with a different python version 3.6 vs 3.8 or 32 bit vs 64 bit specify that version instead of -3.8 to the `py` command below. If you want to build additional versions while keeping all virtual environments setup use a different location for each virtual environment. +To build with a different python version 3.7 vs 3.8 or 32 bit vs 64 bit specify that version instead of -3.8 to the `py` command below. If you want to build additional versions while keeping all virtual environments setup use a different location for each virtual environment. $ cd $ py -3.8 -m venv .\env diff --git a/build.py b/build.py index 6c137030..9aa9e106 100644 --- a/build.py +++ b/build.py @@ -150,8 +150,8 @@ def build_normal(): def main(): - if sys.version_info < (3, 6): - sys.exit("Python < 3.6 is unsupported.") + if sys.version_info < (3, 7): + sys.exit("Python < 3.7 is unsupported.") options = parse_args() if options.clean and Path("build").exists(): shutil.rmtree("build") diff --git a/macos.md b/macos.md index b7eff3fc..e026538f 100644 --- a/macos.md +++ b/macos.md @@ -2,7 +2,7 @@ ### Prerequisites -- [Python 3.6+][python] +- [Python 3.7+][python] - [Xcode 12.3][xcode] or just Xcode command line tools (older versions can be used if not interested in arm macs) - [Homebrew][homebrew] - [qt5](https://www.qt.io/) @@ -12,7 +12,7 @@ 2. Install [Homebrew][homebrew], if not on the path after install (arm based Macs) create `~/.zshrc` with `export PATH="/opt/homebrew/bin:$PATH"`. Will need to reload terminal or source the file to take effect. -3. Install qt5 with `brew`. If you are using a version of macos without system python 3.6+ then you will +3. Install qt5 with `brew`. If you are using a version of macos without system python 3.7+ then you will also need to install that via brew or with pyenv. $ brew install qt5 diff --git a/pkg/debian/control b/pkg/debian/control index 8e752bc6..8370e7ae 100644 --- a/pkg/debian/control +++ b/pkg/debian/control @@ -10,7 +10,7 @@ Vcs-Git: https://github.com/arsenetar/dupeguru.git Package: {pkgname} Architecture: {arch} -Depends: ${shlibs:Depends}, python3 (>=3.6), python3-pyqt5, python3-mutagen +Depends: ${shlibs:Depends}, python3 (>=3.7), python3-pyqt5, python3-mutagen Provides: dupeguru-se, dupeguru-me, dupeguru-pe Replaces: dupeguru-se, dupeguru-me, dupeguru-pe Conflicts: dupeguru-se, dupeguru-me, dupeguru-pe diff --git a/setup.cfg b/setup.cfg index ff0d5353..af79206f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,16 +18,16 @@ classifiers = Operating System :: MacOS :: MacOS X Operating System :: Microsoft :: Windows Operating System :: POSIX - Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 Programming Language :: Python :: 3 :: Only Topic :: Desktop Environment :: File Managers [options] packages = find: -python_requires = >=3.6 +python_requires = >=3.7 install_requires = Send2Trash>=1.3.0 polib>=1.1.0