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

Jump to bottom

pythonPackages.django-simple-captcha: init at 0.5.12 #76515

Merged
merged 3 commits into from Jan 6, 2020
Merged

pythonPackages.django-simple-captcha: init at 0.5.12 #76515

merged 3 commits into from Jan 6, 2020

Conversation

schmittlauch
Copy link
Member

Motivation for this change

This PR succeeds #64523 which has somehow stalled and is based on @MrMebelMan's work.
After approval it probably needs to be squashed into 1 commit, but I wanted to keep the history intact so far.

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.
Notify maintainers

cc @

@schmittlauch schmittlauch mentioned this pull request Dec 25, 2019
Closed
10 tasks
jonringer
jonringer requested changes Dec 26, 2019
View reviewed changes
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.

each package addition should include the additional entry to python-packages. I would also squash the other "enhance" commit into the first simple-captcha bump. Your commit history should be:

pythonPackages.django-simple-captcha: init at 0.5.6
pythonPackages.django-ranged-response: init at 0.2.0

@schmittlauch
Copy link
Member Author

@jonringer Done, commit history adjusted to your requests.

jonringer
jonringer reviewed Dec 26, 2019
View reviewed changes
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.

otherwise LGTM

NIT: the ordering of the packages should probably go in a separate commit, as that's much more likely to cause merge conflicts if these packages needed to be cherry-picked

pkgs/development/python-modules/django-simple-captcha/default.nix Show resolved Hide resolved
pkgs/development/python-modules/django-simple-captcha/default.nix Show resolved Hide resolved
@schmittlauch
Copy link
Member Author

@jonringer all done.
I also formatted both expressions with nixpkgs-nixfmt.

@jonringer
Copy link
Contributor

do you mind resolving conflicts and rebasing?

@schmittlauch
pythonPackages.django-ranged-response: init at 0.2.0
92c9022 
co-author: Vladyslav Burzakovskyy <vladislav.burzakovskij@satoshilabs.com>
@schmittlauch
pythonPackages.django-simple-captcha: init at 0.5.12
c080f3f 
co-author: Vladyslav Burzakovskyy <vladislav.burzakovskij@satoshilabs.com>
@schmittlauch
pythonPackages: re-order django modules
7178664
@schmittlauch
Copy link
Member Author

@jonringer done

jonringer
jonringer approved these changes Jan 3, 2020
View reviewed changes
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.

diff LGTM
commits LGTM

failure unrelated to PR (python38Packages.aiohttp is broken)

[9 built, 9 copied (134.2 MiB), 24.3 MiB DL]
https://github.com/NixOS/nixpkgs/pull/76515
6 package built:
python27Packages.django-ranged-response python27Packages.django-simple-captcha python37Packages.django-ranged-response python37Packages.django-simple-captcha python38Packages.django-ranged-response python38Packages.django-simple-captcha

@jonringer
Copy link
Contributor

@GrahamcOfBorg build python27Packages.django-ranged-response python27Packages.django-simple-captcha python37Packages.django-ranged-response python37Packages.django-simple-captcha python38Packages.django-ranged-response python38Packages.django-simple-captcha

@schmittlauch
Copy link
Member Author

@jonringer FYI: All builds went through

@jonringer jonringer merged commit fe1f77a into NixOS:master Jan 6, 2020
@jonringer
Copy link
Contributor

sorry about that, don't have as much free time as i used to

@schmittlauch
Copy link
Member Author

@jonringer Don't worry, that's why I pinged you. Glad that was okay.

@schmittlauch schmittlauch deleted the init/django-simple-captcha branch January 6, 2020 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 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.

None yet
2 participants
@schmittlauch @jonringer