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

pythonPackages.XlsxWriter: enable tests and pythonPackages.can: 3.0.0 -> 3.1.0 #56298

Merged
merged 2 commits into from
Mar 2, 2019
Merged

pythonPackages.XlsxWriter: enable tests and pythonPackages.can: 3.0.0 -> 3.1.0 #56298

merged 2 commits into from
Mar 2, 2019

Conversation

jluttine
Copy link
Member

Motivation for this change

Update XlsxWriter and also fix+upgrade python-can because otherwise nox-review failed.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jluttine jluttine requested a review from FRidh as a code owner February 24, 2019 14:08
dotlambda
dotlambda requested changes Feb 24, 2019
View reviewed changes
pkgs/development/python-modules/can/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/can/default.nix Outdated Show resolved Hide resolved
@dotlambda
Copy link
Member

The XlsxWriter bump will conflict with the staging-next branch. Let's wait until that is merged.

@jluttine jluttine force-pushed the xlsxwriter-1.1.5 branch 2 times, most recently from 674514c to 4076e0f Compare March 1, 2019 17:03
@jluttine jluttine changed the title pythonPackage.XlsxWriter: 1.1.2 -> 1.1.5 and pythonPackage.can: 3.0.0 -> 3.1.0 pythonPackages.XlsxWriter: 1.1.2 -> 1.1.5 and pythonPackages.can: 2.2.1 -> 3.1.0 Mar 1, 2019
@jluttine
Copy link
Member Author

jluttine commented Mar 1, 2019

Rebased on master.

@GrahamcOfBorg GrahamcOfBorg added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 1, 2019
@jluttine jluttine changed the title pythonPackages.XlsxWriter: 1.1.2 -> 1.1.5 and pythonPackages.can: 2.2.1 -> 3.1.0 pythonPackages.XlsxWriter: enable tests and pythonPackages.can: 3.0.0 -> 3.1.0 Mar 2, 2019
@FRidh
Copy link
Member

FRidh commented Mar 2, 2019

@GrahamcOfBorg build pythonPackages.XlsxWriter python3Packages.XlsxWriter pythonPackages.can python3Packages.can

@jluttine
Copy link
Member Author

jluttine commented Mar 2, 2019

I accidentally first rebased on some really old state of master branch.. Now it should be fixed and I ran nox-review and everything was fine.

@GrahamcOfBorg GrahamcOfBorg removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 2, 2019
@dotlambda dotlambda merged commit 100ec6c into NixOS:master Mar 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotlambda dotlambda dotlambda requested changes

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jluttine @dotlambda @FRidh @GrahamcOfBorg