Henry-Hiles/qmk_userspace
Watch
1
0
Fork
You've already forked qmk_userspace
 0
forked from mirrors/qmk_userspace
Code Pull requests Activity
26,545 commits 2 branches 1 tag 294 MiB
Commit graph qmk_userspace/lib/python/qmk/tests
Author SHA1 Message Date
Joel Challis
fb056c5437
 		Update json2c to use dump_lines (#21013) 2023-05-22 07:03:59 +01:00
Ryan
dc75c23f5c
 		CLI: Improve keymap folder resolution (#20981) 2023-05-19 16:05:43 +10:00
Ryan
578102b400
 		Fix test_json2c_no_json() (#20756) 2023-05-06 14:00:27 +01:00
Ryan
998a4d744e
 		Remove FLIP_HALF layouts and move to data driven (#20588) 2023-04-30 01:51:45 +10:00
Ryan
91e0457b0e
 		JSON encoder: improve sorting of layout dict keys (#19974) 2023-03-13 23:20:54 +11:00
Nick Brassel
4d33f356a6
 		Macro keycode name refactoring (#18958) 2022-11-05 23:22:11 +11:00
Ryan
2f48d300f4
 		Normalise info_config.h define generation (#18439) 
* Normalise info_config.h define generation

* format

* Fix tests

* Update lib/python/qmk/cli/generate/config_h.py

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-09-21 18:31:57 +01:00
Joel Challis
20f142a772
 		Tidy up LAYOUT macro generation (#18262) 2022-09-19 01:35:46 +01:00
Ryan
d983251c10
 		Switch over MANUFACTURER and PRODUCT to string literals (#18183) 2022-08-28 09:59:40 -07:00
Niko Wenselowski
1f42a8ccdd
 		Fix test logic to check for both keymaps (#17761) 
Python will evaluate first the left and then the right side of the and operator.

The left side would previously return True based on the truthiness logic that treats any non-emptry string as true.

It would not check if the desired keymap exists.

If the left side is true it will evaluate the right side which will check for the existance of a specific keymap.

With this change the check for existance of two keymaps is implemented.
 2022-07-23 17:42:19 +01:00
Joel Challis
a599550adb
 		Add support for linting deprecated and removed functionality (#17063) 
* Add support for more lint warnings/errors

* Develop currently needs extra deps installed

* Lint a few more scenarios

* fix tests
 2022-06-09 21:02:16 +01:00
Ryan
7d41639d54
 		Map data driven DESCRIPTION as string literal (#16523) 2022-03-05 00:20:34 +00:00
QMK Bot
36e47cb3aa Merge remote-tracking branch 'origin/master' into develop 2022-02-28 20:03:22 +00:00
Erovia
fbfd5312b9
 		CLI: Validate JSON keymap input (#16261) 
* Fix schema validator

It should use the passed schema.

* Add required attributes to keymap schema

* Rework subcommands to validate the JSON keymaps

The 'compile', 'flash' and 'json2c' subcommands were reworked to add
JSON keymap validation so error is reported for non-JSON and
non-compliant-JSON inputs.

* Fix required fields in keymap schema

* Add tests

* Fix compiling keymaps directly from keymap directory

* Schema should not require version for now.
 2022-02-28 20:02:39 +00:00
Joel Challis
e4a6afa369
 		Rework generate-api CLI command to use .build directory (#16441) 2022-02-27 12:28:51 +01:00
Drashna Jaelre
d4dc743a85
 		Fix issues with Python Tests (#16162) 
* Reformat python due to yapf changes

* Fix pytest keymap list test

* revert formatting

* Use contra, because, well

https://www.reddit.com/r/MechanicalKeyboards/comments/8riofq/did_i_kill_my_contra/
 2022-02-02 15:44:42 +11:00
Zach White
08ce0142ba
 		Macros in JSON keymaps (#14374) 
* macros in json keymaps

* add advanced macro support to json

* add a note about escaping macro strings

* add simple examples

* format json

* add support for language specific keymap extras

* switch to dictionaries instead of inline text for macros

* use SS_TAP on the innermost tap keycode

* add the new macro format to the schema

* document the macro limit

* add the json keyword for syntax highlighting

* fix format that vscode screwed up

* Update feature_macros.md

* add tests for macros

* change ding to beep

* add json support for SENDSTRING_BELL

* update doc based on feedback from sigprof

* document host_layout

* remove unused var

* improve carriage return handling

* support tab characters as well

* Update docs/feature_macros.md

Co-authored-by: Nick Brassel <nick@tzarc.org>

* escape backslash characters

* format

* flake8

* Update quantum/quantum_keycodes.h

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-11-22 11:11:35 -08:00
Drashna Jael're
4be9919e9f
 		Merge remote-tracking branch 'origin/master' into develop 2021-11-19 09:48:23 -08:00
Joel Challis
cd50fdf7ee
 		Add diff logic to python format subcommand (#15156) 
* Add diff logic to python format subcommand

* Update test

* Add in filter per format-c

* fix tests

* Update new workflow
 2021-11-17 23:02:45 +00:00
Ryan
9401836727
 		Map PRODUCT define to keyboard_name (#14372) 
* Map `PRODUCT` define to `keyboard_name`

* Fix tests

* Fix last test
 2021-11-05 08:08:52 +11:00
Zach White
596c4a1f87
 		Remove bin/qmk (#14231) 
* Remove the bin/qmk script

* remove bin/qmk from workflows
 2021-08-29 16:50:22 -07:00
Ryan
25f43837d2
 		Remove references to info.json width and height in CLI (#13728) 2021-07-29 22:37:18 -07:00
Erovia
fdcea06336
 		CLI/Docs: Fix the format commands' name (#13668) 
PR #13296 changed the name of the `cformat` and `pyformat` commands to
`format-c` and `format-py` respectively. This PR updates the documentation
and some parts of the CLI to use the new names.
Also add documentation for the new `format-text` subcommand, introduced
in the same PR.
 2021-07-23 21:41:33 +01:00
Ryan
bbe43a91eb
 		CLI: Add subcommand to generate version.h (#13151) 2021-06-27 02:29:02 +10:00
Zach White
6955c5a002 Merge remote-tracking branch 'origin/master' into develop 
Resolved Conflicts:
	lib/python/qmk/tests/test_cli_commands.py
	util/install/fedora.sh
 2021-05-19 15:49:11 -07:00
Zach White
db1eacdaac
 		Align our subprocess usage with current best practices. (#12940) 
* Align our subprocess usage with current best practices.

* remove unused import

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* fix the cpp invocation for older python

* allow for unprompted installation

* make sure qmk new-keyboard works on windows

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-05-19 15:24:46 -07:00
Zach White
de5c30a9ba
 		Use milc.subcommand.config instead of qmk.cli.config (#12915) 
* Use milc.subcommand.config instead

* pyformat

* remove the config test
 2021-05-16 11:06:57 -07:00
QMK Bot
911b45ce3b Merge remote-tracking branch 'origin/master' into develop 2021-05-10 18:19:15 +00:00
Zach White
a3e7f3e7c5
 		Improve our CI tests (#11476) 
* add a test and dry-run to qmk generate-api

* add a dry-run to qmk pyformat

* Add a --dry-run to qmk cformat

* reverse the order of nose2 and flake8 tests

* run CI test against cformat and pyformat

* fix programming errors

* tweak job name

* fix argument

* refine the files we select

* fix stack trace in --ci

* make cformat exit clean

* fix c file extensions

* decouple CI from pyformat

* remove --ci arg

* make ci happy

* use the environment var instead

* change output to text

* fix log message

* replace tabs
 2021-05-10 11:18:44 -07:00
QMK Bot
a747ef966b Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:38:44 +00:00
Zach White
3e60997edb
 		Add a qmk format-json command that will format JSON files (#12372) 
* Add a command to format json files

* change to work after rebase

* add test for qmk format-json

* add documentation for qmk format-json

* Update lib/python/qmk/cli/format/json.py
 2021-03-25 22:38:10 +11:00
QMK Bot
0dc0516f0c Merge remote-tracking branch 'origin/master' into develop 2021-03-24 16:27:28 +00:00
Zach White
299008be36
 		Add support for qmk_configurator style aliases (#11954) 
* Add support for qmk_configurator style aliases

* add the keyboard aliases to the api data

* add support for a keyboard metadata file

* make flake8 happy
 2021-03-24 09:26:38 -07:00
Zach White
b0069c5c05
 		Begin the process of deprecating bin/qmk in favor of the global cli (#12109) 
* Begin the process of deprecating bin/qmk in favor of the global cli

* Correctly set the qmk bin
 2021-03-07 19:10:03 -08:00
Zach White
1581ea48dc
 		Fix develop (#12039) 
Fixes file encoding errors on Windows, and layouts not correctly merging into info.json.

* force utf8 encoding

* correctly merge layouts and layout aliases

* show what aliases point to
 2021-02-27 12:00:50 -08:00
Zach White
ef6329af7c
 		Create a system to map between info.json and config.h/rules.mk (#11548) 
* generate rules.mk from a json mapping

* generate rules.mk from a json mapping

* support for config.h from json maps

* improve the mapping system

* document the mapping system

* move data/maps to data/mappings

* fix flake8 errors

* fixup LED_MATRIX_DRIVER

* remove product and description from the vision_division keymap level

* reduce the complexity of generate-rules-mk

* add tests for the generate commands

* fix qmk doctor when submodules are not clean
 2021-01-31 12:46:00 -08:00
Joel Challis
f03b10b6c1
 		Migrate python tests away from onekey (#11367) 
* Migrate python tests away from onekey

* Add stub files to stop lint complaints

* Make all the pytest keymaps compile
 2021-01-05 00:52:31 +00:00
LongerHV
221d8fd866
 		[CLI] Add stdin support for json2c command (#11289) 
* Implement stdin for json2c command

* Refactor

* Handle json decode error

* Add stdin support for c2json cli command

* Refactor to prevent code duplication

* Change exit(1) to return False in c2json command

* Remove unused import
 2020-12-29 11:34:48 -08:00
Ryan
37fb14f1b5
 		CLI-ify rgblight_breathing_table_calc.c (#11174) 
Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Co-authored-by: Zach White <skullydazed@drpepper.org>
 2020-12-16 14:24:42 +11:00
Zach White
8724a70c4c
 		Reduce travis load by replacing an exclusive grep with an inclusive grep (#10964) 
* add -n to avoid compiling

* switch to an include rather than exclude strategy
 2020-11-30 11:19:44 -08:00
Erovia
b337ba798e
 		CLI: Udev related fixes and improvements (#10736) 2020-11-16 21:09:32 +00:00
Ryan
7ef98e7f61
 		CLI: Add qmk clean (#10785) 2020-11-04 19:18:47 +00:00
Ryan
e69da2db2c
 		qmk info: Add --ascii flag (#10793) 
* `qmk info`: Add `--ascii` flag

* Fix typo

* Force ASCII for Windows/MSYS2

* Make it gooder

* Remove redundant windows check

* ...And this too

* Make pytest work on Windows
 2020-11-02 00:41:01 -08:00
Zach White
0c42f91f4c
 		Generate api data on each push (#10609) 
* add new qmk generate-api command, to generate a complete set of API data.

* Generate api data and push it to the keyboard repo

* fix typo

* Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>

* fixup api workflow

* remove file-changes-action

* use a more mainstream github action

* fix yaml error

* Apply suggestions from code review

Co-authored-by: Erovia <Erovia@users.noreply.github.com>

* more uniform date handling

* make flake8 happy

* Update lib/python/qmk/decorators.py

Co-authored-by: Erovia <Erovia@users.noreply.github.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
 2020-10-25 14:48:44 -07:00
Erovia
058737f116
 		[CLI] Add c2json (#8817) 
* Basic keymap parsing finally works

* Add 'keymap.json' creation to the qmk.keymap module

* Add tests and fix formatting

* Fix/exclude flake8 errors

* Convert keymap.c to valid keymap.json

* Fix some errors

* Add tests

* Finalize keymap.json creation, add json template

* Add docs

* Move pygments to the standard requirements

* Add support for nameless layers, fix tests

* Fix things after rebase

* Add missing 'keymap' value.

* Fix missing layer numbers from advanced keycodes

Buckwich noticed that if the advanced keycode / layer toggling key
contains a number, it goes missing.
Now we properly handle them.
Thx for noticing!

* Apply suggestions from code review

* fixup tests

Co-authored-by: Zach White <skullydazed@drpepper.org>
Co-authored-by: skullY <skullydazed@gmail.com>
 2020-10-06 17:10:19 -07:00
Ryan
2c9ffd4739
 		CLI: update subcommands to use return instead of exit() (#10323) 2020-10-06 16:46:10 -07:00
Ryan
db80209e69
 		Parse version better in qmk doctor GCC version checks (#9324) 2020-06-18 19:37:47 +01:00
Zach White
751316c344
 		[CLI] Add a subcommand for getting information about a keyboard (#8666) 
You can now use `qmk info` to get information about keyboards and keymaps.

Co-authored-by: Erovia <Erovia@users.noreply.github.com>
 2020-05-26 13:05:41 -07:00
Erovia
6501377070
 		CLI: fix json2c subcommand and add/fix tests (#9206) 
Co-authored-by: Zach White <skullydazed@users.noreply.github.com>
 2020-05-26 17:43:33 +02:00
codecoffeecode
f125406700
 		Adding unit tests for list-keymaps command (#7711) 
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: Erovia <Erovia@users.noreply.github.com>
 2020-05-16 22:47:07 +02:00