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

Jump to bottom

Update Python dependencies for Nix #12855

Merged
merged 10 commits into from
Jun 20, 2021
Merged

Update Python dependencies for Nix #12855

merged 10 commits into from
Jun 20, 2021

Commits on May 31, 2021

  1. Nix: Reorder dependencies in pyproject.toml to match requirements.txt

    @sigprof
    sigprof committed May 31, 2021
    Configuration menu
    Copy the full SHA
    f4d00ab View commit details
    Browse the repository at this point in the history

  2. Nix: Update milc version in pyproject.toml to match requirements.txt 

    The lock file already contained milc 1.3.0, but pyproject.toml still
specified the minimum required version as 1.1.0, which is not compatible
with the current Python code.
    @sigprof
    sigprof committed May 31, 2021
    Configuration menu
    Copy the full SHA
    4d94497 View commit details
    Browse the repository at this point in the history

  3. Nix: Remove Wave from pyproject.toml 

    Apparenty the `wave` entry was added to requirements-dev.txt by mistake
(the code actually uses the builtin `wave` package, not the `Wave`
project that is available on PyPi). That entry has already been removed
from requirements-dev.txt; remove it from pyproject.toml too.
    @sigprof
    sigprof committed May 31, 2021
    Configuration menu
    Copy the full SHA
    065f8d5 View commit details
    Browse the repository at this point in the history

  4. Nix: Add hid and pyusb to Python dependencies 

    Recent updated added `hid` and `pyusb` to requirements-dev.txt; update
pyproject.toml accordingly.  In addition, these Python modules use
native libraries (`hidapi` and `libusb1`), and need Nix-specific changes
to find those libraries; add the needed changes to shell.nix as
overrides.  The `pyusb` override was copied from the corresponding
nixpkgs package; the `hid` override is new, because that Python package
is not in nixpkgs at the moment.
    @sigprof
    sigprof committed May 31, 2021
    Configuration menu
    Copy the full SHA
    02c59dd View commit details
    Browse the repository at this point in the history

  5. Nix: Rename the poetry project to qmk_firmware 

    The `qmk` name collides with the name of the QMK CLI package.
    @sigprof
    sigprof committed May 31, 2021
    Configuration menu
    Copy the full SHA
    36055b8 View commit details
    Browse the repository at this point in the history

  6. Nix: Add QMK CLI to Python dependencies 

    Current QMK build scripts loudly complain about the missing QMK CLI.
The obvious solution is to include `qmk` in the list of Python
dependencies in pyproject.toml; this makes the `qmk` executable
available in the nix-shell environment, and stops the warnings.

Note that any leftover `bin/qmk` uses may become errors after this
change, because apparently the Nix wrapper for the `qmk` executable
prepends a directory containing some `python3` version to `$PATH`, but
that `python3` cannot find the Python packages required by `bin/qmk`.
However, if the code uses `$(QMK_BIN)` correctly, it would run the `qmk`
executable from `$PATH` instead, which would run properly.
    @sigprof
    sigprof committed May 31, 2021
    Configuration menu
    Copy the full SHA
    7c3f080 View commit details
    Browse the repository at this point in the history

  7. Use upstreamed poetry2nix overrides for hid and pyusb

    @purcell @sigprof
    purcell authored and sigprof committed May 31, 2021
    Configuration menu
    Copy the full SHA
    8f6ce33 View commit details
    Browse the repository at this point in the history

  8. Nix: Change Python dependency on qmk to wildcard 

    The `qmk = "^0.0.46"` dependency specification automatically added by
`poetry add qmk` is not suitable, because it prevents any version
upgrades for the `qmk` package due to the special handling of `0.0` for
caret requirements. Replace this specification with `"*"`, so that
`poetry update --lock` could be used to bump the locked version to the
latest available without the need to change `pyproject.toml`.

Co-authored-by: Steve Purcell <[email protected]>
    @sigprof @purcell
    sigprof and purcell committed May 31, 2021
    Configuration menu
    Copy the full SHA
    1430a2f View commit details
    Browse the repository at this point in the history

  9. Nix: Bump locked versions for Python dependencies 

    Use the latest QMK CLI (0.0.46 -> 0.0.48) and other packages:

 - argcomplete: 1.12.2 -> 1.12.3
 - attrs: 20.3.0 -> 21.2.0
 - flake8: 3.9.0 -> 3.9.2
 - six: 1.15.0 -> 1.16.0
 - pygments: 2.8.1 -> 2.9.0
    @sigprof
    sigprof committed May 31, 2021
    Configuration menu
    Copy the full SHA
    876a963 View commit details
    Browse the repository at this point in the history

  10. Nix: Bump locked versions for Python dependencies 

    Use `( cd nix && poetry update --lock; )` to update all Python
dependencies to their most recent versions (although `requirements.txt`
has not been changed, the actual code is no longer compatible with older
versions of some Python packages).

Dependency changes:

 - halo: 0.0.31 (new)
 - log-symbols: 0.0.14 (new)
 - milc: 1.3.0 -> 1.4.2
 - qmk: 0.0.48 -> 0.0.51
 - spinners: 0.0.24 (new)
 - termcolor: 1.1.0 (new)
    @sigprof
    sigprof committed May 31, 2021
    Configuration menu
    Copy the full SHA
    3788f01 View commit details
    Browse the repository at this point in the history