diff options
| author | QMK Bot <hello@qmk.fm> | 2021-06-07 23:31:29 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-06-07 23:31:29 +0000 |
| commit | f3fb3849a24b1ffc421ea83febe66adc77ebe38d (patch) | |
| tree | 18b1475ccb211c1c2a3f32499c33842e5b66c21e | |
| parent | c508da8a8e908f36beeb2fca5d8397a6e3ab7bb6 (diff) | |
| parent | c277ae47681366df5b03c146ea20c0aac72699ed (diff) | |
| download | qmk_firmware-f3fb3849a24b1ffc421ea83febe66adc77ebe38d.tar.gz qmk_firmware-f3fb3849a24b1ffc421ea83febe66adc77ebe38d.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | requirements-dev.txt | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements-dev.txt b/requirements-dev.txt index 12d570e70..1db3b6d73 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt | |||
| @@ -4,7 +4,5 @@ | |||
| 4 | # Python development requirements | 4 | # Python development requirements |
| 5 | nose2 | 5 | nose2 |
| 6 | flake8 | 6 | flake8 |
| 7 | hid | ||
| 8 | pep8-naming | 7 | pep8-naming |
| 9 | pyusb | ||
| 10 | yapf | 8 | yapf |
diff --git a/requirements.txt b/requirements.txt index 8553e2c3f..d354d6bb2 100644 --- a/requirements.txt +++ b/requirements.txt | |||
| @@ -3,7 +3,9 @@ appdirs | |||
| 3 | argcomplete | 3 | argcomplete |
| 4 | colorama | 4 | colorama |
| 5 | dotty-dict | 5 | dotty-dict |
| 6 | hid | ||
| 6 | hjson | 7 | hjson |
| 7 | jsonschema>=3 | 8 | jsonschema>=3 |
| 8 | milc>=1.3.0 | 9 | milc>=1.3.0 |
| 9 | pygments | 10 | pygments |
| 11 | pyusb | ||