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.isort: 4.2.5 -> 4.3.4 #36426

Merged
merged 1 commit into from May 14, 2018
Merged

pythonPackages.isort: 4.2.5 -> 4.3.4 #36426

merged 1 commit into from May 14, 2018

Conversation

couchemar
Copy link
Contributor

@couchemar couchemar commented Mar 7, 2018 •
edited

Motivation for this change

Update isort to the most recent version

Related to #35444

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@couchemar couchemar requested a review from FRidh as a code owner March 7, 2018 15:22
dotlambda
dotlambda requested changes Apr 14, 2018
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind moving the expression out of python-packages.nix?

pkgs/top-level/python-packages.nix Outdated
@@ -8977,13 +8977,13 @@ in {
isort = buildPythonPackage rec {
name = "${pname}-${version}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drop this line

pkgs/top-level/python-packages.nix Outdated
@@ -8977,13 +8977,13 @@ in {
isort = buildPythonPackage rec {
name = "${pname}-${version}";
pname = "isort";
version = "4.2.5";
version = "4.3.4";
src = pkgs.fetchurl {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use fetchPypi instead

@couchemar
Copy link
Contributor Author

I think isort is a dependency of the some other packages or apps, and we cannot easy move it out of the python-packages.nix

@FRidh
Copy link
Member

FRidh commented Apr 19, 2018

@couchemar the expression can be moved to pkgs/development/python-modules/isort/default.nix and then then called from python-packages.nix with callPackage.

@couchemar
Copy link
Contributor Author

ok, i will change soon

@couchemar
Copy link
Contributor Author

couchemar commented Apr 27, 2018 •
edited

@dotlambda @FRidh
Expression is in separated file now.

dotlambda
dotlambda reviewed Apr 27, 2018
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add some blank lines where appropriate

pkgs/development/python-modules/isort/default.nix Outdated
inherit pname version;
sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r";
};
propagatedBuildInputs = [ ] ++ optionals isPy27 [ futures ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

propagatedBuildInputs = lib.optional isPy27 futures;

pkgs/development/python-modules/isort/default.nix Outdated
sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r";
};
propagatedBuildInputs = [ ] ++ optionals isPy27 [ futures ];
# Some tests not pass
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know why they fail?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, there is 3 tests which fails when i make nox-review ... I have no idea why...

@dotlambda
Copy link
Member

@couchemar I simply disabled the failing tests. Please have a look.

@GrahamcOfBorg build python2.pkgs.isort python3.pkgs.isort

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2.pkgs.isort, python3.pkgs.isort

Partial log (click to expand)

test_isort.py .......................................................... [ 50%]
..........................................................               [100%]

=================== 116 passed, 3 deselected in 3.52 seconds ===================
test_isort.py .......................................................... [ 50%]
..........................................................               [100%]

================== 116 passed, 3 deselected in 14.75 seconds ===================
/nix/store/fybh12lswybcgzw6s3qn2xy3kvy8kqz8-python2.7-isort-4.3.4
/nix/store/mxhcazyhh8mnqc22aps0b1zi8a2w6npw-python3.6-isort-4.3.4

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2.pkgs.isort, python3.pkgs.isort

Partial log (click to expand)

test_isort.py .......................................................... [ 50%]
..........................................................               [100%]

=================== 116 passed, 3 deselected in 6.13 seconds ===================
test_isort.py .......................................................... [ 50%]
..........................................................               [100%]

================== 116 passed, 3 deselected in 30.71 seconds ===================
/nix/store/jafiyzmjiv43qcaiy5v7scpgyr7jx475-python2.7-isort-4.3.4
/nix/store/izrsh0adnyspy8mg1fz15slypsjrv3sp-python3.6-isort-4.3.4

@dotlambda dotlambda changed the title isort: 4.2.5 -> 4.3.4 pythonPackages.isort: 4.2.5 -> 4.3.4 Apr 29, 2018
@couchemar
Copy link
Contributor Author

Is there reasons do not merge this request?

@dotlambda
Copy link
Member

None besides me not noticing your approval.

@dotlambda dotlambda merged commit 3189704 into NixOS:master May 14, 2018
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 8.has: clean-up 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@couchemar @FRidh @dotlambda @GrahamcOfBorg