~ruther/qmk_firmware

cd336b2b545798269405e8ffef0fe8958d4d27d4 — Zach White 4 years ago 57d2409
bump to python 3.7 (#11408)

5 files changed, 23 insertions(+), 55 deletions(-)

M lib/python/qmk/cli/__init__.py
M util/install/gentoo.sh
D util/install/opensuse.sh
D util/install/sabayon.sh
M util/qmk_install.sh
M lib/python/qmk/cli/__init__.py => lib/python/qmk/cli/__init__.py +20 -2
@@ 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)

M util/install/gentoo.sh => util/install/gentoo.sh +1 -1
@@ 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

D util/install/opensuse.sh => util/install/opensuse.sh +0 -31
@@ 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
}

D util/install/sabayon.sh => util/install/sabayon.sh +0 -15
@@ 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
}

M util/qmk_install.sh => util/qmk_install.sh +2 -6
@@ 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