aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach White <skullydazed@gmail.com>2021-02-13 10:26:45 -0800
committerGitHub <noreply@github.com>2021-02-13 10:26:45 -0800
commitcd336b2b545798269405e8ffef0fe8958d4d27d4 (patch)
treed463b119356c8b9c4af9674a23d128cf3a957163
parent57d2409c081c2fd546036a6b15dfbd9481fddc1d (diff)
downloadqmk_firmware-cd336b2b545798269405e8ffef0fe8958d4d27d4.tar.gz
qmk_firmware-cd336b2b545798269405e8ffef0fe8958d4d27d4.zip
bump to python 3.7 (#11408)
-rw-r--r--lib/python/qmk/cli/__init__.py22
-rwxr-xr-xutil/install/gentoo.sh2
-rwxr-xr-xutil/install/opensuse.sh31
-rwxr-xr-xutil/install/sabayon.sh15
-rwxr-xr-xutil/qmk_install.sh8
5 files changed, 23 insertions, 55 deletions
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index 1732287da..a5f1f4767 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -27,6 +27,24 @@ from . import new
27from . import pyformat 27from . import pyformat
28from . import pytest 28from . import pytest
29 29
30if sys.version_info[0] != 3 or sys.version_info[1] < 6: 30# Supported version information
31 cli.log.error('Your Python is too old! Please upgrade to Python 3.6 or later.') 31#
32# Based on the OSes we support these are the minimum python version available by default.
33# Last update: 2021 Jan 02
34#
35# Arch: 3.9
36# Debian: 3.7
37# Fedora 31: 3.7
38# Fedora 32: 3.8
39# Fedora 33: 3.9
40# FreeBSD: 3.7
41# Gentoo: 3.7
42# macOS: 3.9 (from homebrew)
43# msys2: 3.8
44# Slackware: 3.7
45# solus: 3.7
46# void: 3.9
47
48if sys.version_info[0] != 3 or sys.version_info[1] < 7:
49 cli.log.error('Your Python is too old! Please upgrade to Python 3.7 or later.')
32 exit(127) 50 exit(127)
diff --git a/util/install/gentoo.sh b/util/install/gentoo.sh
index d4284e9a9..97eb5df07 100755
--- a/util/install/gentoo.sh
+++ b/util/install/gentoo.sh
@@ -23,7 +23,7 @@ _qmk_install() {
23 sudo emerge -auN sys-devel/gcc 23 sudo emerge -auN sys-devel/gcc
24 sudo emerge -au --noreplace \ 24 sudo emerge -au --noreplace \
25 app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang sys-devel/crossdev \ 25 app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang sys-devel/crossdev \
26 \>=dev-lang/python-3.6 \ 26 \>=dev-lang/python-3.7 \
27 dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util 27 dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util
28 28
29 sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr 29 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 47b44ae36..000000000
--- a/util/install/opensuse.sh
+++ /dev/null
@@ -1,31 +0,0 @@
1#!/bin/bash
2
3_qmk_install_prepare() {
4 case $(grep ID /etc/os-release) in
5 *15.1*)
6 REPO_RELEASE=Leap_15.1;;
7 *15.2*)
8 REPO_RELEASE=Leap_15.2;;
9 *)
10 #REPO_RELEASE=Tumbleweed;;
11 echo "ERROR: Tumbleweed is currently not supported."
12 exit 1
13 esac
14
15 sudo zypper addrepo https://download.opensuse.org/repositories/devel:gcc/openSUSE_$REPO_RELEASE/devel:gcc.repo
16 sudo zypper addrepo https://download.opensuse.org/repositories/hardware/openSUSE_$REPO_RELEASE/hardware.repo
17 sudo zypper --gpg-auto-import-keys refresh
18}
19
20_qmk_install() {
21 echo "Installing dependencies"
22
23 sudo zypper install -y \
24 make clang gcc unzip wget zip \
25 python3-pip \
26 cross-avr-binutils cross-avr-gcc8 avr-libc \
27 cross-arm-binutils cross-arm-none-gcc8 cross-arm-none-newlib-devel \
28 avrdude dfu-programmer dfu-util
29
30 python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
31}
diff --git a/util/install/sabayon.sh b/util/install/sabayon.sh
deleted file mode 100755
index fd4f4d8df..000000000
--- a/util/install/sabayon.sh
+++ /dev/null
@@ -1,15 +0,0 @@
1#!/bin/bash
2
3_qmk_install() {
4 echo "Installing dependencies"
5
6 sudo equo install \
7 app-arch/unzip app-arch/zip net-misc/wget dev-vcs/git sys-devel/clang sys-devel/gcc sys-devel/crossdev \
8 dev-python/pip \
9 dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util
10
11 sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr
12 sudo crossdev -s4 --stable --g \<9 --portage --verbose --target arm-none-eabi
13
14 python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
15}
diff --git a/util/qmk_install.sh b/util/qmk_install.sh
index 5076e980a..421a91a99 100755
--- a/util/qmk_install.sh
+++ b/util/qmk_install.sh
@@ -25,10 +25,6 @@ case $(uname -a) in
25 . "$QMK_FIRMWARE_UTIL_DIR/install/fedora.sh";; 25 . "$QMK_FIRMWARE_UTIL_DIR/install/fedora.sh";;
26 *gentoo*) 26 *gentoo*)
27 . "$QMK_FIRMWARE_UTIL_DIR/install/gentoo.sh";; 27 . "$QMK_FIRMWARE_UTIL_DIR/install/gentoo.sh";;
28 *opensuse*|*tumbleweed*)
29 . "$QMK_FIRMWARE_UTIL_DIR/install/opensuse.sh";;
30 *sabayon*)
31 . "$QMK_FIRMWARE_UTIL_DIR/install/sabayon.sh";;
32 *slackware*) 28 *slackware*)
33 . "$QMK_FIRMWARE_UTIL_DIR/install/slackware.sh";; 29 . "$QMK_FIRMWARE_UTIL_DIR/install/slackware.sh";;
34 *solus*) 30 *solus*)
@@ -36,9 +32,9 @@ case $(uname -a) in
36 *void*) 32 *void*)
37 . "$QMK_FIRMWARE_UTIL_DIR/install/void.sh";; 33 . "$QMK_FIRMWARE_UTIL_DIR/install/void.sh";;
38 *) 34 *)
39 echo "Sorry, we don't recognize your distribution. Help us by contributing support!" 35 echo "Sorry, we don't recognize your distribution. Try using the docker image instead:"
40 echo 36 echo
41 echo "https://docs.qmk.fm/#/contributing" 37 echo "https://docs.qmk.fm/#/getting_started_docker"
42 exit 1;; 38 exit 1;;
43 esac 39 esac
44 40