Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Python dependencies for Nix #12855

Merged
merged 10 commits into from
Jun 20, 2021
Merged

Update Python dependencies for Nix #12855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f4d00ab
Nix: Reorder dependencies in pyproject.toml to match requirements.txt
sigprof May 10, 2021
4d94497
Nix: Update milc version in pyproject.toml to match requirements.txt
sigprof May 10, 2021
065f8d5
Nix: Remove `Wave` from pyproject.toml
sigprof May 10, 2021
02c59dd
Nix: Add `hid` and `pyusb` to Python dependencies
sigprof May 10, 2021
36055b8
Nix: Rename the poetry project to `qmk_firmware`
sigprof May 10, 2021
7c3f080
Nix: Add QMK CLI to Python dependencies
sigprof May 10, 2021
8f6ce33
Use upstreamed poetry2nix overrides for hid and pyusb
purcell May 11, 2021
1430a2f
Nix: Change Python dependency on `qmk` to wildcard
sigprof May 13, 2021
876a963
Nix: Bump locked versions for Python dependencies
sigprof May 13, 2021
3788f01
Nix: Bump locked versions for Python dependencies
sigprof May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 136 additions & 38 deletions nix/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions nix/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# It is particularly required by the Nix environment (see shell.nix). To update versions,
# normally one would run "poetry update --lock"
[tool.poetry]
name = "qmk"
name = "qmk_firmware"
version = "0.1.0"
description = ""
authors = []
Expand All @@ -12,18 +12,20 @@ python = "^3.8"
appdirs = "^1.4.4"
argcomplete = "^1.12.2"
colorama = "^0.4.4"
hjson = "^3.0.2"
milc = "^1.1.0"
Pygments = "^2.8.0"
dotty-dict = "^1.3.0"
hjson = "^3.0.2"
jsonschema = "^3.2.0"
milc = "^1.3.0"
Pygments = "^2.8.0"
qmk = "*"

[tool.poetry.dev-dependencies]
nose2 = "^0.10.0"
flake8 = "^3.8.4"
hid = "^1.0.4"
pep8-naming = "^0.11.1"
pyusb = "^1.1.1"
yapf = "^0.30.0"
Wave = "^0.0.2"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
12 changes: 12 additions & 0 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,17 @@
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/c0e881852006b132236cbf0301bd1939bb50867e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"poetry2nix": {
"branch": "master",
"description": "Convert poetry projects to nix automagically [maintainer=@adisbladis] ",
"homepage": "",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "2d27d44397242b28c3f0081e0432e4f6c951f3a1",
"sha256": "06syfg150r59m4kksj5547b5kwxjxjaif5hiljcq966kb9hxsvmv",
"type": "tarball",
"url": "https://github.com/nix-community/poetry2nix/archive/2d27d44397242b28c3f0081e0432e4f6c951f3a1.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
Loading