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

Bump django-contrib, django-hijack, django-hijack-admin #54328

Merged
merged 4 commits into from Jan 20, 2019
Merged

Bump django-contrib, django-hijack, django-hijack-admin #54328

merged 4 commits into from Jan 20, 2019

Conversation

risicle
Copy link
Contributor

@risicle risicle commented Jan 19, 2019 •
edited

Motivation for this change

Fairly straightforward bumps except for a couple of changes to the checkPhases that were needed.

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.

@risicle risicle requested a review from FRidh as a code owner January 19, 2019 15:49
dotlambda
dotlambda requested changes Jan 19, 2019
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.

The commit messages should be prefixed with pythonPackages..

@risicle
Copy link
Contributor Author

risicle commented Jan 19, 2019

Ahok

@risicle risicle force-pushed the ris-django-contrib-hijack-admin-hijack-bump branch from c206959 to d39f3b6 Compare January 19, 2019 17:08
dotlambda
dotlambda reviewed Jan 20, 2019
View reviewed changes
pkgs/development/python-modules/django-hijack/default.nix Outdated
@@ -3,15 +3,15 @@
}:
buildPythonPackage rec {
pname = "django-hijack";
version = "2.1.9";
version = "2.1.10";
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.

Remove this line.

pkgs/development/python-modules/django-hijack-admin/default.nix Outdated
# source directory
mkdir testbase
pushd testbase
cp ../runtests.py .
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
cp ../runtests.py .
mv ../runtests.py .

@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.django-compat python2.pkgs.django-hijack python2.pkgs.django-hijack-admin python3.pkgs.django-compat python3.pkgs.django-hijack python3.pkgs.django-hijack-admin

@risicle risicle force-pushed the ris-django-contrib-hijack-admin-hijack-bump branch from d39f3b6 to 88b985b Compare January 20, 2019 12:15
@risicle
Copy link
Contributor Author

risicle commented Jan 20, 2019

Come to think - should these packages be using a custom installCheckPhase rather than checkPhase seeing as they're expecting the package to already be installed?

@dotlambda
Copy link
Member

For Python packages, these are the same.

@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.django-compat python2.pkgs.django-hijack python2.pkgs.django-hijack-admin python3.pkgs.django-compat python3.pkgs.django-hijack python3.pkgs.django-hijack-admin

@dotlambda
Copy link
Member

dotlambda commented Jan 20, 2019 •
edited

@risicle The packages' attribute names use _, not -. Please correct the commit messages.

@GrahamcOfBorg build python2.pkgs.django_compat python2.pkgs.django_hijack python2.pkgs.django_hijack_admin python3.pkgs.django_compat python3.pkgs.django_hijack python3.pkgs.django_hijack_admin

@risicle risicle force-pushed the ris-django-contrib-hijack-admin-hijack-bump branch from 88b985b to ed4bf38 Compare January 20, 2019 15:59
@risicle
Copy link
Contributor Author

risicle commented Jan 20, 2019

Ah I guess we're going for the attr names here. Changed.

@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.django_compat python2.pkgs.django_hijack python2.pkgs.django_hijack_admin python3.pkgs.django_compat python3.pkgs.django_hijack python3.pkgs.django_hijack_admin

@dotlambda dotlambda merged commit 70f3067 into NixOS:master Jan 20, 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

@lsix lsix Awaiting requested review from lsix

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.

None yet
3 participants
@risicle @dotlambda @GrahamcOfBorg