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

Update django guardian #22025

Merged
merged 4 commits into from Jan 25, 2017
Merged

Update django guardian #22025

merged 4 commits into from Jan 25, 2017

Conversation

lsix
Copy link
Member

@lsix lsix commented Jan 21, 2017

Motivation for this change
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
    • Linux
  • 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.

@mention-bot
Copy link

@lsix, thanks for your PR! By analyzing the history of the files in this pull request, we identified @FRidh to be a potential reviewer.

@Mic92
Copy link
Member

Mic92 commented Jan 22, 2017

@lsix Btw. We are in the progress of moving python packages out of pkgs/top-level/python-packages.nix into dedicated files in ./pkgs/development/python-modules because it is getting to big.
Unfortunate this is a manual process, so we move new and upgrades python packages there.

@lsix
Copy link
Member Author

lsix commented Jan 23, 2017

OK, lets go for that.

Is there a particular layout to follow or everything will be dropped flat in ./pkgs/development/python-modules (there will be a huge amount of files)? I did not see a mail on the ML about that (I might have missed it) and the closest I see in the issues is #11567 (again, I might probably have missed something).

Could you point me to the appropriate updated guideline ?

@FRidh
Copy link
Member

FRidh commented Jan 23, 2017

@lsix there wasn't any mail about this. At some point I started moving new packages into new files and asked others to do the same.

I will update #11567 to reflect this change.

@lsix lsix force-pushed the update_django_guardian branch 2 times, most recently from aefcebb to 04a6131 Compare January 23, 2017 22:21
@lsix
Copy link
Member Author

lsix commented Jan 24, 2017

OK, I’ve moved it out of the python-packages.nix file. I’ve also moved pytest while I was at it (but I am not quite satisfied of hew the overrides ends up being written, any better idea?).

Also, the question still remains. Do we lay out all the new *.nix files flat in pkgs/development/python-modules? There will be a huge amount of files at the end. This is not unmanageable, but if we want another organization (thematic as in the rest of nixpkgs or other), it is a good time to make the choice ;)

@FRidh
Copy link
Member

FRidh commented Jan 24, 2017

OK, I’ve moved it out of the python-packages.nix file. I’ve also moved pytest while I was at it (but I am not quite satisfied of hew the overrides ends up being written, any better idea?).

I think we should copy the expressions instead of overriding them.

Also, the question still remains. Do we lay out all the new *.nix files flat in pkgs/development/python-modules? There will be a huge amount of files at the end. This is not unmanageable, but if we want another organization (thematic as in the rest of nixpkgs or other), it is a good time to make the choice ;)

If we need to subgroup, then in my opinion we should subgroup on first character of the name.

@lsix lsix force-pushed the update_django_guardian branch 4 times, most recently from 56cabe8 to 9a6c04d Compare January 24, 2017 20:08
@lsix lsix changed the title Update django guardian [WIP] Update django guardian Jan 24, 2017
@lsix lsix changed the title [WIP] Update django guardian Update django guardian Jan 24, 2017
@lsix
Copy link
Member Author

lsix commented Jan 24, 2017

I’ve updated the PR, removed the overridings in the pytest declarations and added an update of pytest-3.0branch. nox-review passes successfully.

@FRidh
Copy link
Member

FRidh commented Jan 25, 2017

Excellent, thank you. Hopefully soon we can get rid of the old versions of pytest.

@FRidh FRidh merged commit cad9bdc into NixOS:master Jan 25, 2017
@lsix
Copy link
Member Author

lsix commented Jan 25, 2017

@FRidh yes, changing the default pytest to pytest_30 is defensively on my TODO list, but there are too much derivations impacted for my laptop… Do you know an hydra instance that could be used to see what would be broken if we did this change?

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

Successfully merging this pull request may close these issues.

None yet

4 participants