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.

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

zict: disable python 2 and 3.5. #97605

Merged
merged 3 commits into from Sep 23, 2020
Merged

zict: disable python 2 and 3.5. #97605

merged 3 commits into from Sep 23, 2020

Conversation

teh
Copy link
Contributor

@teh teh commented Sep 9, 2020

Part of ZHF in #97479

Motivation for this change

Zero hydra failures

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@drewrisinger drewrisinger left a comment

Choose a reason for hiding this comment

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

  • Diff LGTM, minus change to clearer pythonOlder
  • commits should be broken up, one per file.
  • builds via nix-review
1 package removed:
python2.7-zict (†2.0.0)

@@ -35,11 +36,14 @@ buildPythonPackage rec {
sha256 = "469e505fd7ce75f600188bdb69a95641899d5b372f74246c8f308376b6929e9c";
};

# zict dependency is now python 3.6+ only
disabled = !(pythonAtLeast "3.6");
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
disabled = !(pythonAtLeast "3.6");
disabled = pythonOlder "3.6";

@@ -38,6 +39,9 @@ buildPythonPackage rec {
requests
];

# zict dependency is now python 3.6+ only
disabled = !(pythonAtLeast "3.6");
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
disabled = !(pythonAtLeast "3.6");
disabled = pythonOlder "3.6";

@@ -38,6 +39,9 @@ buildPythonPackage rec {
requests
];

# zict dependency is now python 3.6+ only
Copy link
Contributor

Choose a reason for hiding this comment

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

Wording is a little confusing, implies that it would support e.g. py3.5 if not for zict. Maybe just say is python 3.6+ only, though that's implied by disabled=pythonOlder 3.6

@@ -38,6 +39,9 @@ buildPythonPackage rec {
requests
];

# zict dependency is now python 3.6+ only
Copy link
Contributor

Choose a reason for hiding this comment

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

then dict should be marked accordingly, I wouldn't mark this as disabled just because a dependency doesn't work on it.

One example would be if someone override zict, streamz should still work.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the review! To clarify: You are saying that marking zict as pythonOlder "3.6"; is enough?

Copy link
Contributor

Choose a reason for hiding this comment

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

That's enough for me. Looking at the distributed and streamz dependencies on PyPi, those list the required python as >=3.6, so marking zict, streamz, distributed as disabled = pythonOlder "3.6"; without comment seems good to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok thanks - updated accordingly.

@drewrisinger
Copy link
Contributor

drewrisinger commented Sep 14, 2020

Can you break this into 3 commits, one per file? You can do this with git reset --soft HEAD~1, then individually commit & force-push git push -f.

PR & commit titles should also be named something like python27Packages.zict: disable (NOTE the pythonPackages prefix especially).
Thanks for the PR!

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 97605 1

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

oh, diff lgtm, but commit history should be split into 3, as said above

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants