New release: 0.3.5 → 0.4.0

Unpin dependencies

.bumpversion.cfg

@@ -0,0 +1,12 @@
+[bumpversion]
+current_version = 0.4.0
+commit = True
+tag = True
+tag_name = {new_version}
+message = New release: {current_version} → {new_version}
+
+[bumpversion:file:.bumpversion.cfg]
+
+[bumpversion:file:qmk_cli/__init__.py]
+
+[bumpversion:file:setup.cfg]

README.md

@@ -17,9 +17,43 @@ A program to help users work with [QMK Firmware](https://qmk.fm/).
     * `qmk lint`
     * ...and many more!
 
+# Packages
+
+We provide "install and go" packages for many Operating Systems.
+
+## Linux
+
+Packages for several distributions available here: https://github.com/qmk/qmk_fpm
+
+## macOS
+
+Using [Homebrew](https://brew.sh):
+
+    brew install qmk/qmk/qmk
+
+## Windows
+
+Download our custom MSYS2 installer here: https://msys.qmk.fm/
+
 # Quickstart
 
 * `python3 -m pip install qmk`
 * `qmk setup`
 
+# Building
+
+We follow PEP517, you can install using [build](https://pypi.org/project/build/):
+
+Setup:
+
+    python3 -m pip install build
+
+Build:
+
+    python3 -m build
+
+You can read more about working with PEP517 packages in the [Python Packaging User Guide](https://packaging.python.org/guides/distributing-packages-using-setuptools/#packaging-your-project).
+
+# Documentation
+
 Full documentation: <https://docs.qmk.fm/#/tutorial>

qmk_cli/__init__.py

@@ -1,3 +1,3 @@
 """A program to help you work with qmk_firmware."""
 
-__version__ = '0.3.1'
+__version__ = '0.4.0'

qmk_cli/subcommands/console.py

@@ -48,10 +48,11 @@ KNOWN_BOOTLOADERS = {
     ('239A', '000C'): 'caterina: Adafruit Feather 32U4',
     ('239A', '000D'): 'caterina: Adafruit ItsyBitsy 32U4 3v',
     ('239A', '000E'): 'caterina: Adafruit ItsyBitsy 32U4 5v',
-    ('239A', '000E'): 'caterina: Adafruit ItsyBitsy 32U4 5v',
     ('2A03', '0036'): 'caterina: Arduino Leonardo',
     ('2A03', '0037'): 'caterina: Arduino Micro',
-    ('314B', '0106'): 'apm32-dfu: APM32 DFU ISP Mode'
+    ('314B', '0106'): 'apm32-dfu: APM32 DFU ISP Mode',
+    ('03EB', '2067'): 'qmk-hid: HID Bootloader',
+    ('03EB', '2045'): 'lufa-ms: LUFA Mass Storage Bootloader'
 }
 
 

requirements-dev.txt

@@ -1,28 +1,4 @@
-bleach==4.0.0
+build
-build==0.6.0.post1
+bumpversion
-bump2version==1.0.1
+requests
-bumpversion==0.6.0
+twine
-certifi==2021.5.30
-cffi==1.14.6
-chardet==4.0.0
-cryptography==3.4.7
-docutils==0.17.1
-idna==2.10
-importlib-metadata==4.6.3
-jeepney==0.7.1
-keyring==23.0.1
-packaging==21.0
-pkginfo==1.7.1
-pycparser==2.20
-pyparsing==2.4.7
-readme-renderer==29.0
-requests==2.26.0
-requests-toolbelt==0.9.1
-rfc3986==1.5.0
-SecretStorage==3.3.1
-six==1.16.0
-tqdm==4.62.0
-twine==3.4.2
-urllib3==1.26.6
-webencodings==0.5.1
-zipp==3.5.0

setup.cfg

@@ -1,13 +1,5 @@
-[bumpversion]
+#[bumpversion]
-current_version = 0.3.1
+# Bumpversion config has been moved to .bumpversion.cfg
-commit = True
-tag = True
-tag_name = {new_version}
-message = New release: {current_version} → {new_version}
-
-[bumpversion:file:qmk_cli/__init__.py]
-
-[bumpversion:file:setup.cfg]
 
 [bdist_wheel]
 universal = 1
@@ -17,7 +9,7 @@ ignore = E501,E226
 
 [metadata]
 name = qmk
-version = 0.3.0
+version = 0.4.0
 author = skullydazed
 author_email = skullydazed@gmail.com
 description = A program to help users work with QMK Firmware.
@@ -44,24 +36,15 @@ classifiers =
 
 [options]
 install_requires = 
-	appdirs==1.4.4
+	hid
-	argcomplete==1.12.3
+	milc>=1.4.2
-	attrs==21.2.0
+	pyusb
-	colorama==0.4.4
-	coverage==5.5
-	halo==0.0.31
-	hid==1.0.4
-	log-symbols==0.0.14
-	mccabe==0.6.1
-	milc==1.5.0
-	pycodestyle==2.7.0
-	pyflakes==2.3.1
-	pyrsistent==0.18.0
-	pyusb==1.2.1
 	setuptools>=45
-	six==1.16.0
+	# qmk_firmware packages
-	spinners==0.0.24
+	hjson
-	termcolor==1.1.0
+	jsonschema>=3
+	pygments
+	qmk-dotty-dict
 packages = find:
 python_requiures = >=3.7
 

trigger_packages

@@ -11,8 +11,8 @@ gh_user = environ.get('GH_USERNAME', 'qmk-bot')
 gh_pat = environ.get('QMK_BOT_TOKEN', '')
 gh_repo_owner = environ.get('REPO_OWNER', 'qmk')
 gh_repo_name = environ.get('REPO_NAME', 'qmk_fpm')
-gh_ref = environ.get('GITHUB_REF', 'main')
+gh_ref = environ.get('BRANCH_NAME', 'main')
-gh_workflow_ids = environ.get('WORKFLOW_IDS', 'debian-buster-publish.yml,fedora-33-publish.yml,fedora-35-publish.yml,fedora-32-publish.yml,fedora-34-publish.yml,ubuntu-focal-publish.yml').split(',')
+gh_workflow_ids = environ.get('WORKFLOW_IDS', 'debian-buster-publish.yml,fedora-32-publish.yml,ubuntu-focal-publish.yml').split(',')
 gh_api_url = environ.get('GITHUB_API_URL', 'https://api.github.com')
 gh_workflow_args = {'ref': gh_ref}
 gh_workflow_headers = {'Accept': 'application/vnd.github.v3+json'}