diff options
author | Sergey Vlasov <sigprof@gmail.com> | 2021-08-30 00:24:43 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-29 22:24:43 +0100 |
commit | a1866a962c21a6e15f40cbde2bd09c0ff42f1454 (patch) | |
tree | a9703c68d3ae4bae352d0e7cb827acd1f3474cd7 | |
parent | ef7fdee6c803bf92bd6d892326c05ee1f473ad07 (diff) | |
download | qmk_firmware-a1866a962c21a6e15f40cbde2bd09c0ff42f1454.tar.gz qmk_firmware-a1866a962c21a6e15f40cbde2bd09c0ff42f1454.zip |
Update the nix-shell environment (#13316)
* Nix: Allow calls to `bin/qmk` even when the build was started by `qmk`
The `$PATH` modifications performed by the Nix wrapper for the `qmk`
executable prevent `bin/qmk` from working properly (the changed `$PATH`
contains a wrong `python3` executable which does not have the needed
Python modules in its module path). As a workaround, disable the
generation of that wrapper for the `qmk` Python package (there is yet
another wrapper generated while building the Python environment, which
would still set the Python module path properly when running `qmk`).
Although `bin/qmk` is officially deprecated, QMK CLI still invokes it in
some cases (at least `qmk doctor` and `qmk pytest`), therefore keeping
these invocations working is useful.
* Nix: Update `util/nix/pyproject.toml` to match `requirements*.txt`
Update the Python dependency information used by Poetry to match the
current state of the qmk_firmware code.
* Nix: Bump QMK CLI dependency to 1.0.0; bump other Python deps
Update Python dependencies for nix-shell to the most recent releases:
- dotty-dict: 1.3.0 -> no longer used
- milc: 1.4.2 -> 1.6.2
- pep8-naming: 0.11.1 -> 0.12.1
- pygments: 2.9.0 -> 2.10.0
- pyrsistent: 0.17.3 -> 0.18.0
- pyusb: 1.1.1 -> 1.2.1
- setuptools-scm: 6.0.1 -> no longer used
- qmk: 0.1.0 -> 1.0.0
- qmk-dotty-dict: not used -> 1.3.0.post1
- yapf: 0.30.0 -> 0.31.0
Note to self: The command to update Python dependencies changed to:
( cd util/nix && nix run 'nixpkgs#poetry' -- update --lock )
-rw-r--r-- | shell.nix | 7 | ||||
-rw-r--r-- | util/nix/poetry.lock | 121 | ||||
-rw-r--r-- | util/nix/pyproject.toml | 32 |
3 files changed, 86 insertions, 74 deletions
@@ -12,6 +12,13 @@ let | |||
12 | # files if the requirements*.txt files change | 12 | # files if the requirements*.txt files change |
13 | pythonEnv = poetry2nix.mkPoetryEnv { | 13 | pythonEnv = poetry2nix.mkPoetryEnv { |
14 | projectDir = ./util/nix; | 14 | projectDir = ./util/nix; |
15 | overrides = poetry2nix.overrides.withDefaults (self: super: { | ||
16 | qmk = super.qmk.overridePythonAttrs(old: { | ||
17 | # Allow QMK CLI to run "bin/qmk" as a subprocess (the wrapper changes | ||
18 | # $PATH and breaks these invocations). | ||
19 | dontWrapPythonPrograms = true; | ||
20 | }); | ||
21 | }); | ||
15 | }; | 22 | }; |
16 | in | 23 | in |
17 | 24 | ||
diff --git a/util/nix/poetry.lock b/util/nix/poetry.lock index 1a1aefe21..9bb0f64de 100644 --- a/util/nix/poetry.lock +++ b/util/nix/poetry.lock | |||
@@ -43,7 +43,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" | |||
43 | name = "coverage" | 43 | name = "coverage" |
44 | version = "5.5" | 44 | version = "5.5" |
45 | description = "Code coverage measurement for Python" | 45 | description = "Code coverage measurement for Python" |
46 | category = "main" | 46 | category = "dev" |
47 | optional = false | 47 | optional = false |
48 | python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" | 48 | python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" |
49 | 49 | ||
@@ -51,21 +51,10 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" | |||
51 | toml = ["toml"] | 51 | toml = ["toml"] |
52 | 52 | ||
53 | [[package]] | 53 | [[package]] |
54 | name = "dotty-dict" | ||
55 | version = "1.3.0" | ||
56 | description = "Dictionary wrapper for quick access to deeply nested keys." | ||
57 | category = "main" | ||
58 | optional = false | ||
59 | python-versions = "*" | ||
60 | |||
61 | [package.dependencies] | ||
62 | setuptools_scm = "*" | ||
63 | |||
64 | [[package]] | ||
65 | name = "flake8" | 54 | name = "flake8" |
66 | version = "3.9.2" | 55 | version = "3.9.2" |
67 | description = "the modular source code checker: pep8 pyflakes and co" | 56 | description = "the modular source code checker: pep8 pyflakes and co" |
68 | category = "main" | 57 | category = "dev" |
69 | optional = false | 58 | optional = false |
70 | python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" | 59 | python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" |
71 | 60 | ||
@@ -151,13 +140,13 @@ colorama = ">=0.3.9" | |||
151 | name = "mccabe" | 140 | name = "mccabe" |
152 | version = "0.6.1" | 141 | version = "0.6.1" |
153 | description = "McCabe checker, plugin for flake8" | 142 | description = "McCabe checker, plugin for flake8" |
154 | category = "main" | 143 | category = "dev" |
155 | optional = false | 144 | optional = false |
156 | python-versions = "*" | 145 | python-versions = "*" |
157 | 146 | ||
158 | [[package]] | 147 | [[package]] |
159 | name = "milc" | 148 | name = "milc" |
160 | version = "1.4.2" | 149 | version = "1.6.2" |
161 | description = "Opinionated Batteries-Included Python 3 CLI Framework." | 150 | description = "Opinionated Batteries-Included Python 3 CLI Framework." |
162 | category = "main" | 151 | category = "main" |
163 | optional = false | 152 | optional = false |
@@ -174,7 +163,7 @@ spinners = "*" | |||
174 | name = "nose2" | 163 | name = "nose2" |
175 | version = "0.10.0" | 164 | version = "0.10.0" |
176 | description = "unittest2 with plugins, the succesor to nose" | 165 | description = "unittest2 with plugins, the succesor to nose" |
177 | category = "main" | 166 | category = "dev" |
178 | optional = false | 167 | optional = false |
179 | python-versions = "*" | 168 | python-versions = "*" |
180 | 169 | ||
@@ -188,20 +177,21 @@ dev = ["Sphinx (>=1.6.5)", "sphinx-rtd-theme", "mock", "coverage"] | |||
188 | 177 | ||
189 | [[package]] | 178 | [[package]] |
190 | name = "pep8-naming" | 179 | name = "pep8-naming" |
191 | version = "0.11.1" | 180 | version = "0.12.1" |
192 | description = "Check PEP-8 naming conventions, plugin for flake8" | 181 | description = "Check PEP-8 naming conventions, plugin for flake8" |
193 | category = "dev" | 182 | category = "dev" |
194 | optional = false | 183 | optional = false |
195 | python-versions = "*" | 184 | python-versions = "*" |
196 | 185 | ||
197 | [package.dependencies] | 186 | [package.dependencies] |
187 | flake8 = ">=3.9.1" | ||
198 | flake8-polyfill = ">=1.0.2,<2" | 188 | flake8-polyfill = ">=1.0.2,<2" |
199 | 189 | ||
200 | [[package]] | 190 | [[package]] |
201 | name = "pycodestyle" | 191 | name = "pycodestyle" |
202 | version = "2.7.0" | 192 | version = "2.7.0" |
203 | description = "Python style guide checker" | 193 | description = "Python style guide checker" |
204 | category = "main" | 194 | category = "dev" |
205 | optional = false | 195 | optional = false |
206 | python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" | 196 | python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" |
207 | 197 | ||
@@ -209,13 +199,13 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" | |||
209 | name = "pyflakes" | 199 | name = "pyflakes" |
210 | version = "2.3.1" | 200 | version = "2.3.1" |
211 | description = "passive checker of Python programs" | 201 | description = "passive checker of Python programs" |
212 | category = "main" | 202 | category = "dev" |
213 | optional = false | 203 | optional = false |
214 | python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" | 204 | python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" |
215 | 205 | ||
216 | [[package]] | 206 | [[package]] |
217 | name = "pygments" | 207 | name = "pygments" |
218 | version = "2.9.0" | 208 | version = "2.10.0" |
219 | description = "Pygments is a syntax highlighting package written in Python." | 209 | description = "Pygments is a syntax highlighting package written in Python." |
220 | category = "main" | 210 | category = "main" |
221 | optional = false | 211 | optional = false |
@@ -223,50 +213,44 @@ python-versions = ">=3.5" | |||
223 | 213 | ||
224 | [[package]] | 214 | [[package]] |
225 | name = "pyrsistent" | 215 | name = "pyrsistent" |
226 | version = "0.17.3" | 216 | version = "0.18.0" |
227 | description = "Persistent/Functional/Immutable data structures" | 217 | description = "Persistent/Functional/Immutable data structures" |
228 | category = "main" | 218 | category = "main" |
229 | optional = false | 219 | optional = false |
230 | python-versions = ">=3.5" | 220 | python-versions = ">=3.6" |
231 | 221 | ||
232 | [[package]] | 222 | [[package]] |
233 | name = "pyusb" | 223 | name = "pyusb" |
234 | version = "1.1.1" | 224 | version = "1.2.1" |
235 | description = "Python USB access module" | 225 | description = "Python USB access module" |
236 | category = "main" | 226 | category = "main" |
237 | optional = false | 227 | optional = false |
238 | python-versions = "*" | 228 | python-versions = ">=3.6.0" |
239 | 229 | ||
240 | [[package]] | 230 | [[package]] |
241 | name = "qmk" | 231 | name = "qmk" |
242 | version = "0.0.51" | 232 | version = "1.0.0" |
243 | description = "A program to help users work with QMK Firmware." | 233 | description = "A program to help users work with QMK Firmware." |
244 | category = "main" | 234 | category = "main" |
245 | optional = false | 235 | optional = false |
246 | python-versions = ">=3.7" | 236 | python-versions = "*" |
247 | 237 | ||
248 | [package.dependencies] | 238 | [package.dependencies] |
249 | dotty-dict = "*" | ||
250 | flake8 = "*" | ||
251 | hid = "*" | 239 | hid = "*" |
252 | hjson = "*" | 240 | hjson = "*" |
253 | jsonschema = ">=3" | 241 | jsonschema = ">=3" |
254 | milc = ">=1.4.0" | 242 | milc = ">=1.4.2" |
255 | nose2 = "*" | ||
256 | pygments = "*" | 243 | pygments = "*" |
257 | pyusb = "*" | 244 | pyusb = "*" |
258 | yapf = "*" | 245 | qmk-dotty-dict = "*" |
259 | 246 | ||
260 | [[package]] | 247 | [[package]] |
261 | name = "setuptools-scm" | 248 | name = "qmk-dotty-dict" |
262 | version = "6.0.1" | 249 | version = "1.3.0.post1" |
263 | description = "the blessed package to manage your versions by scm tags" | 250 | description = "Dictionary wrapper for quick access to deeply nested keys." |
264 | category = "main" | 251 | category = "main" |
265 | optional = false | 252 | optional = false |
266 | python-versions = ">=3.6" | 253 | python-versions = "*" |
267 | |||
268 | [package.extras] | ||
269 | toml = ["toml"] | ||
270 | 254 | ||
271 | [[package]] | 255 | [[package]] |
272 | name = "six" | 256 | name = "six" |
@@ -294,16 +278,16 @@ python-versions = "*" | |||
294 | 278 | ||
295 | [[package]] | 279 | [[package]] |
296 | name = "yapf" | 280 | name = "yapf" |
297 | version = "0.30.0" | 281 | version = "0.31.0" |
298 | description = "A formatter for Python code." | 282 | description = "A formatter for Python code." |
299 | category = "main" | 283 | category = "dev" |
300 | optional = false | 284 | optional = false |
301 | python-versions = "*" | 285 | python-versions = "*" |
302 | 286 | ||
303 | [metadata] | 287 | [metadata] |
304 | lock-version = "1.1" | 288 | lock-version = "1.1" |
305 | python-versions = "^3.8" | 289 | python-versions = "^3.8" |
306 | content-hash = "5e181d51536240d08c74ba6a46bd0988ee4ca72ac3d5b388965ca8023e9b9a99" | 290 | content-hash = "468ae51aaddfe2ce62938f131c688bbc447e41608d4dd7d30db36391c38bda20" |
307 | 291 | ||
308 | [metadata.files] | 292 | [metadata.files] |
309 | appdirs = [ | 293 | appdirs = [ |
@@ -376,9 +360,6 @@ coverage = [ | |||
376 | {file = "coverage-5.5-pp37-none-any.whl", hash = "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4"}, | 360 | {file = "coverage-5.5-pp37-none-any.whl", hash = "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4"}, |
377 | {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"}, | 361 | {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"}, |
378 | ] | 362 | ] |
379 | dotty-dict = [ | ||
380 | {file = "dotty_dict-1.3.0.tar.gz", hash = "sha256:eb0035a3629ecd84397a68f1f42f1e94abd1c34577a19cd3eacad331ee7cbaf0"}, | ||
381 | ] | ||
382 | flake8 = [ | 363 | flake8 = [ |
383 | {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"}, | 364 | {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"}, |
384 | {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"}, | 365 | {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"}, |
@@ -412,16 +393,16 @@ mccabe = [ | |||
412 | {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"}, | 393 | {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"}, |
413 | ] | 394 | ] |
414 | milc = [ | 395 | milc = [ |
415 | {file = "milc-1.4.2-py2.py3-none-any.whl", hash = "sha256:65ee004caa769b1ee144b15be7908d1f623920ab6f356e5c5c95be9457aa15d8"}, | 396 | {file = "milc-1.6.2-py2.py3-none-any.whl", hash = "sha256:cb26404c7f3d6797c9c42005de732161e45e21294cde85845e914b279321bdad"}, |
416 | {file = "milc-1.4.2.tar.gz", hash = "sha256:c6b2f19e3196b00a0060f8c883533e356f2054a9f81692b7b97ccee0d01626fd"}, | 397 | {file = "milc-1.6.2.tar.gz", hash = "sha256:779710a0b9300bef3c5748158887e6c734659e147d55548d9e4701d7a7d5dddf"}, |
417 | ] | 398 | ] |
418 | nose2 = [ | 399 | nose2 = [ |
419 | {file = "nose2-0.10.0-py2.py3-none-any.whl", hash = "sha256:aa620e759f2c5018d9ba041340391913e282ecebd3c392027f1575847b093ec6"}, | 400 | {file = "nose2-0.10.0-py2.py3-none-any.whl", hash = "sha256:aa620e759f2c5018d9ba041340391913e282ecebd3c392027f1575847b093ec6"}, |
420 | {file = "nose2-0.10.0.tar.gz", hash = "sha256:886ba617a96de0130c54b24479bd5c2d74d5c940d40f3809c3a275511a0c4a60"}, | 401 | {file = "nose2-0.10.0.tar.gz", hash = "sha256:886ba617a96de0130c54b24479bd5c2d74d5c940d40f3809c3a275511a0c4a60"}, |
421 | ] | 402 | ] |
422 | pep8-naming = [ | 403 | pep8-naming = [ |
423 | {file = "pep8-naming-0.11.1.tar.gz", hash = "sha256:a1dd47dd243adfe8a83616e27cf03164960b507530f155db94e10b36a6cd6724"}, | 404 | {file = "pep8-naming-0.12.1.tar.gz", hash = "sha256:bb2455947757d162aa4cad55dba4ce029005cd1692f2899a21d51d8630ca7841"}, |
424 | {file = "pep8_naming-0.11.1-py2.py3-none-any.whl", hash = "sha256:f43bfe3eea7e0d73e8b5d07d6407ab47f2476ccaeff6937c84275cd30b016738"}, | 405 | {file = "pep8_naming-0.12.1-py2.py3-none-any.whl", hash = "sha256:4a8daeaeb33cfcde779309fc0c9c0a68a3bbe2ad8a8308b763c5068f86eb9f37"}, |
425 | ] | 406 | ] |
426 | pycodestyle = [ | 407 | pycodestyle = [ |
427 | {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"}, | 408 | {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"}, |
@@ -432,23 +413,43 @@ pyflakes = [ | |||
432 | {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"}, | 413 | {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"}, |
433 | ] | 414 | ] |
434 | pygments = [ | 415 | pygments = [ |
435 | {file = "Pygments-2.9.0-py3-none-any.whl", hash = "sha256:d66e804411278594d764fc69ec36ec13d9ae9147193a1740cd34d272ca383b8e"}, | 416 | {file = "Pygments-2.10.0-py3-none-any.whl", hash = "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380"}, |
436 | {file = "Pygments-2.9.0.tar.gz", hash = "sha256:a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f"}, | 417 | {file = "Pygments-2.10.0.tar.gz", hash = "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"}, |
437 | ] | 418 | ] |
438 | pyrsistent = [ | 419 | pyrsistent = [ |
439 | {file = "pyrsistent-0.17.3.tar.gz", hash = "sha256:2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e"}, | 420 | {file = "pyrsistent-0.18.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f4c8cabb46ff8e5d61f56a037974228e978f26bfefce4f61a4b1ac0ba7a2ab72"}, |
421 | {file = "pyrsistent-0.18.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:da6e5e818d18459fa46fac0a4a4e543507fe1110e808101277c5a2b5bab0cd2d"}, | ||
422 | {file = "pyrsistent-0.18.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:5e4395bbf841693eaebaa5bb5c8f5cdbb1d139e07c975c682ec4e4f8126e03d2"}, | ||
423 | {file = "pyrsistent-0.18.0-cp36-cp36m-win32.whl", hash = "sha256:527be2bfa8dc80f6f8ddd65242ba476a6c4fb4e3aedbf281dfbac1b1ed4165b1"}, | ||
424 | {file = "pyrsistent-0.18.0-cp36-cp36m-win_amd64.whl", hash = "sha256:2aaf19dc8ce517a8653746d98e962ef480ff34b6bc563fc067be6401ffb457c7"}, | ||
425 | {file = "pyrsistent-0.18.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58a70d93fb79dc585b21f9d72487b929a6fe58da0754fa4cb9f279bb92369396"}, | ||
426 | {file = "pyrsistent-0.18.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:4916c10896721e472ee12c95cdc2891ce5890898d2f9907b1b4ae0f53588b710"}, | ||
427 | {file = "pyrsistent-0.18.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:73ff61b1411e3fb0ba144b8f08d6749749775fe89688093e1efef9839d2dcc35"}, | ||
428 | {file = "pyrsistent-0.18.0-cp37-cp37m-win32.whl", hash = "sha256:b29b869cf58412ca5738d23691e96d8aff535e17390128a1a52717c9a109da4f"}, | ||
429 | {file = "pyrsistent-0.18.0-cp37-cp37m-win_amd64.whl", hash = "sha256:097b96f129dd36a8c9e33594e7ebb151b1515eb52cceb08474c10a5479e799f2"}, | ||
430 | {file = "pyrsistent-0.18.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:772e94c2c6864f2cd2ffbe58bb3bdefbe2a32afa0acb1a77e472aac831f83427"}, | ||
431 | {file = "pyrsistent-0.18.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:c1a9ff320fa699337e05edcaae79ef8c2880b52720bc031b219e5b5008ebbdef"}, | ||
432 | {file = "pyrsistent-0.18.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:cd3caef37a415fd0dae6148a1b6957a8c5f275a62cca02e18474608cb263640c"}, | ||
433 | {file = "pyrsistent-0.18.0-cp38-cp38-win32.whl", hash = "sha256:e79d94ca58fcafef6395f6352383fa1a76922268fa02caa2272fff501c2fdc78"}, | ||
434 | {file = "pyrsistent-0.18.0-cp38-cp38-win_amd64.whl", hash = "sha256:a0c772d791c38bbc77be659af29bb14c38ced151433592e326361610250c605b"}, | ||
435 | {file = "pyrsistent-0.18.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d5ec194c9c573aafaceebf05fc400656722793dac57f254cd4741f3c27ae57b4"}, | ||
436 | {file = "pyrsistent-0.18.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:6b5eed00e597b5b5773b4ca30bd48a5774ef1e96f2a45d105db5b4ebb4bca680"}, | ||
437 | {file = "pyrsistent-0.18.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:48578680353f41dca1ca3dc48629fb77dfc745128b56fc01096b2530c13fd426"}, | ||
438 | {file = "pyrsistent-0.18.0-cp39-cp39-win32.whl", hash = "sha256:f3ef98d7b76da5eb19c37fda834d50262ff9167c65658d1d8f974d2e4d90676b"}, | ||
439 | {file = "pyrsistent-0.18.0-cp39-cp39-win_amd64.whl", hash = "sha256:404e1f1d254d314d55adb8d87f4f465c8693d6f902f67eb6ef5b4526dc58e6ea"}, | ||
440 | {file = "pyrsistent-0.18.0.tar.gz", hash = "sha256:773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"}, | ||
440 | ] | 441 | ] |
441 | pyusb = [ | 442 | pyusb = [ |
442 | {file = "pyusb-1.1.1-py3-none-any.whl", hash = "sha256:f18eb813d3a1439918071234589162c2f209a19adbeffeb1377ce078a4aebc70"}, | 443 | {file = "pyusb-1.2.1-py3-none-any.whl", hash = "sha256:2b4c7cb86dbadf044dfb9d3a4ff69fd217013dbe78a792177a3feb172449ea36"}, |
443 | {file = "pyusb-1.1.1.tar.gz", hash = "sha256:7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38"}, | 444 | {file = "pyusb-1.2.1.tar.gz", hash = "sha256:a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9"}, |
444 | ] | 445 | ] |
445 | qmk = [ | 446 | qmk = [ |
446 | {file = "qmk-0.0.51-py2.py3-none-any.whl", hash = "sha256:5f676f389b2450b0956d7eb8e7e378d2e6690d5859a887c91876da0a5faf75ed"}, | 447 | {file = "qmk-1.0.0-py2.py3-none-any.whl", hash = "sha256:63d69b97a533d91b0cfa7887e68cac7df52c6f7bddf4bf44d17ef1241d85ffff"}, |
447 | {file = "qmk-0.0.51.tar.gz", hash = "sha256:efeef209cde1df92b9823db686d9684962cd00aae9f45ba5e3d494aa5b3c6b9a"}, | 448 | {file = "qmk-1.0.0.tar.gz", hash = "sha256:da62eec73c4548cc37b0b9be3937202dc3a301dc2f2663610ecca751a610f9ca"}, |
448 | ] | 449 | ] |
449 | setuptools-scm = [ | 450 | qmk-dotty-dict = [ |
450 | {file = "setuptools_scm-6.0.1-py3-none-any.whl", hash = "sha256:c3bd5f701c8def44a5c0bfe8d407bef3f80342217ef3492b951f3777bd2d915c"}, | 451 | {file = "qmk_dotty_dict-1.3.0.post1-py3-none-any.whl", hash = "sha256:a9cb7fc3ff9631190fee0ecac14986a0ac7b4b6892347dc9d7486a4c4ea24492"}, |
451 | {file = "setuptools_scm-6.0.1.tar.gz", hash = "sha256:d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92"}, | 452 | {file = "qmk_dotty_dict-1.3.0.post1.tar.gz", hash = "sha256:3b611e393660bfaa6835c68e94784bae80fe07b8490978b5ecab03a0d2fc7ea2"}, |
452 | ] | 453 | ] |
453 | six = [ | 454 | six = [ |
454 | {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, | 455 | {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, |
@@ -462,6 +463,6 @@ termcolor = [ | |||
462 | {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"}, | 463 | {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"}, |
463 | ] | 464 | ] |
464 | yapf = [ | 465 | yapf = [ |
465 | {file = "yapf-0.30.0-py2.py3-none-any.whl", hash = "sha256:3abf61ba67cf603069710d30acbc88cfe565d907e16ad81429ae90ce9651e0c9"}, | 466 | {file = "yapf-0.31.0-py2.py3-none-any.whl", hash = "sha256:e3a234ba8455fe201eaa649cdac872d590089a18b661e39bbac7020978dd9c2e"}, |
466 | {file = "yapf-0.30.0.tar.gz", hash = "sha256:3000abee4c28daebad55da6c85f3cd07b8062ce48e2e9943c8da1b9667d48427"}, | 467 | {file = "yapf-0.31.0.tar.gz", hash = "sha256:408fb9a2b254c302f49db83c59f9aa0b4b0fd0ec25be3a5c51181327922ff63d"}, |
467 | ] | 468 | ] |
diff --git a/util/nix/pyproject.toml b/util/nix/pyproject.toml index a81336189..1ec8aacd4 100644 --- a/util/nix/pyproject.toml +++ b/util/nix/pyproject.toml | |||
@@ -9,23 +9,27 @@ authors = [] | |||
9 | 9 | ||
10 | [tool.poetry.dependencies] | 10 | [tool.poetry.dependencies] |
11 | python = "^3.8" | 11 | python = "^3.8" |
12 | appdirs = "^1.4.4" | 12 | appdirs = "*" |
13 | argcomplete = "^1.12.2" | 13 | argcomplete = "*" |
14 | colorama = "^0.4.4" | 14 | colorama = "*" |
15 | dotty-dict = "^1.3.0" | 15 | hid = "*" |
16 | hjson = "^3.0.2" | 16 | hjson = "*" |
17 | jsonschema = "^3.2.0" | 17 | jsonschema = ">=3" |
18 | milc = "^1.3.0" | 18 | milc = ">=1.4.2" |
19 | Pygments = "^2.8.0" | 19 | Pygments = "*" |
20 | pyusb = "*" | ||
21 | qmk-dotty-dict = "*" | ||
22 | |||
23 | # This dependency is not mentioned in requirements.txt (QMK CLI is not a | ||
24 | # library package that is required by the Python code in qmk_firmware), but is | ||
25 | # required to build a proper nix-shell environment. | ||
20 | qmk = "*" | 26 | qmk = "*" |
21 | 27 | ||
22 | [tool.poetry.dev-dependencies] | 28 | [tool.poetry.dev-dependencies] |
23 | nose2 = "^0.10.0" | 29 | nose2 = "*" |
24 | flake8 = "^3.8.4" | 30 | flake8 = "*" |
25 | hid = "^1.0.4" | 31 | pep8-naming = "*" |
26 | pep8-naming = "^0.11.1" | 32 | yapf = "*" |
27 | pyusb = "^1.1.1" | ||
28 | yapf = "^0.30.0" | ||
29 | 33 | ||
30 | [build-system] | 34 | [build-system] |
31 | requires = ["poetry-core>=1.0.0"] | 35 | requires = ["poetry-core>=1.0.0"] |