diff options
| -rw-r--r-- | lib/python/qmk/cli/__init__.py | 22 | ||||
| -rwxr-xr-x | util/install/gentoo.sh | 2 | ||||
| -rwxr-xr-x | util/install/opensuse.sh | 31 | ||||
| -rwxr-xr-x | util/install/sabayon.sh | 15 | ||||
| -rwxr-xr-x | util/qmk_install.sh | 8 | 
5 files changed, 23 insertions, 55 deletions
| diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py index 1732287da0..a5f1f47679 100644 --- a/lib/python/qmk/cli/__init__.py +++ b/lib/python/qmk/cli/__init__.py @@ -27,6 +27,24 @@ from . import new  from . import pyformat  from . import pytest -if sys.version_info[0] != 3 or sys.version_info[1] < 6: -    cli.log.error('Your Python is too old! Please upgrade to Python 3.6 or later.') +# Supported version information +# +# Based on the OSes we support these are the minimum python version available by default. +# Last update: 2021 Jan 02 +# +# Arch: 3.9 +# Debian: 3.7 +# Fedora 31: 3.7 +# Fedora 32: 3.8 +# Fedora 33: 3.9 +# FreeBSD: 3.7 +# Gentoo: 3.7 +# macOS: 3.9 (from homebrew) +# msys2: 3.8 +# Slackware: 3.7 +# solus: 3.7 +# void: 3.9 + +if sys.version_info[0] != 3 or sys.version_info[1] < 7: +    cli.log.error('Your Python is too old! Please upgrade to Python 3.7 or later.')      exit(127) diff --git a/util/install/gentoo.sh b/util/install/gentoo.sh index d4284e9a93..97eb5df07f 100755 --- a/util/install/gentoo.sh +++ b/util/install/gentoo.sh @@ -23,7 +23,7 @@ _qmk_install() {      sudo emerge -auN sys-devel/gcc      sudo emerge -au --noreplace \          app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang sys-devel/crossdev \ -        \>=dev-lang/python-3.6 \ +        \>=dev-lang/python-3.7 \          dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util      sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr diff --git a/util/install/opensuse.sh b/util/install/opensuse.sh deleted file mode 100755 index 47b44ae364..0000000000 --- a/util/install/opensuse.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -_qmk_install_prepare() { -    case $(grep ID /etc/os-release) in -        *15.1*) -            REPO_RELEASE=Leap_15.1;; -        *15.2*) -            REPO_RELEASE=Leap_15.2;; -        *) -            #REPO_RELEASE=Tumbleweed;; -            echo "ERROR: Tumbleweed is currently not supported." -            exit 1 -    esac - -    sudo zypper addrepo https://download.opensuse.org/repositories/devel:gcc/openSUSE_$REPO_RELEASE/devel:gcc.repo -    sudo zypper addrepo https://download.opensuse.org/repositories/hardware/openSUSE_$REPO_RELEASE/hardware.repo -    sudo zypper --gpg-auto-import-keys refresh -} - -_qmk_install() { -    echo "Installing dependencies" - -    sudo zypper install -y \ -        make clang gcc unzip wget zip \ -        python3-pip \ -        cross-avr-binutils cross-avr-gcc8 avr-libc \ -        cross-arm-binutils cross-arm-none-gcc8 cross-arm-none-newlib-devel \ -        avrdude dfu-programmer dfu-util - -    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt -} diff --git a/util/install/sabayon.sh b/util/install/sabayon.sh deleted file mode 100755 index fd4f4d8dfd..0000000000 --- a/util/install/sabayon.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -_qmk_install() { -    echo "Installing dependencies" - -    sudo equo install \ -        app-arch/unzip app-arch/zip net-misc/wget dev-vcs/git sys-devel/clang sys-devel/gcc sys-devel/crossdev \ -        dev-python/pip \ -        dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util - -    sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr -    sudo crossdev -s4 --stable --g \<9 --portage --verbose --target arm-none-eabi - -    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt -} diff --git a/util/qmk_install.sh b/util/qmk_install.sh index 5076e980a2..421a91a999 100755 --- a/util/qmk_install.sh +++ b/util/qmk_install.sh @@ -25,10 +25,6 @@ case $(uname -a) in                  . "$QMK_FIRMWARE_UTIL_DIR/install/fedora.sh";;              *gentoo*)                  . "$QMK_FIRMWARE_UTIL_DIR/install/gentoo.sh";; -            *opensuse*|*tumbleweed*) -                . "$QMK_FIRMWARE_UTIL_DIR/install/opensuse.sh";; -            *sabayon*) -                . "$QMK_FIRMWARE_UTIL_DIR/install/sabayon.sh";;              *slackware*)                  . "$QMK_FIRMWARE_UTIL_DIR/install/slackware.sh";;              *solus*) @@ -36,9 +32,9 @@ case $(uname -a) in              *void*)                  . "$QMK_FIRMWARE_UTIL_DIR/install/void.sh";;              *) -                echo "Sorry, we don't recognize your distribution. Help us by contributing support!" +                echo "Sorry, we don't recognize your distribution. Try using the docker image instead:"                  echo -                echo "https://docs.qmk.fm/#/contributing" +                echo "https://docs.qmk.fm/#/getting_started_docker"                  exit 1;;          esac | 
