public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54328 from risicle/ris-django-contrib-hijack-admin-hijack-bump

Browse Source 
Bump django-contrib, django-hijack, django-hijack-admin
This commit is contained in:
Robert Schütz 2019-01-20 17:44:58 +01:00 committed by GitHub
commit 70f30678ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/python-modules/django-compat/default.nix
View File

@ -1,36 +1,31 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, python, { stdenv, buildPythonPackage, fetchFromGitHub, python,
django, django_nose, six django, six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-compat"; pname = "django-compat";
version = "1.0.14"; version = "1.0.15";
# the pypi packages don't include everything required for the tests # the pypi packages don't include everything required for the tests
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arteria"; owner = "arteria";
repo = "django-compat"; repo = "django-compat";
rev = "v${version}"; rev = "v${version}";
sha256 = "11g6ra6djkchqk44v8k7biaxd1v69qyyyask5l92vmrvb0qiwvm8"; sha256 = "1pr6v38ahrsvxlgmcx69s4b5q5082f44gzi4h3c32sccdc4pwqxp";
}; };
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
# we have to do a little bit of tinkering to convince the tests to run against the installed package, not the # to convince the tests to run against the installed package, not the source directory, we extract the
# source directory # tests directory from it then dispose of the actual source
mkdir -p testbase/compat mv compat/tests .
pushd testbase rm -r compat
# note we're not copying the direct contents of compat/ (notably __init__.py) so python won't recognize this as a substituteInPlace runtests.py --replace compat.tests tests
# package, but the tests need to be in a specific path for the test templates to get picked up. ${python.interpreter} runtests.py
cp -r ../compat/tests compat/
cp ../runtests.py .
${python.interpreter} runtests.py compat/tests
popd
runHook postCheck runHook postCheck
''; '';
checkInputs = [ django_nose ];
propagatedBuildInputs = [ django six ]; propagatedBuildInputs = [ django six ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

14
pkgs/development/python-modules/django-hijack-admin/default.nix
View File

@ -2,14 +2,14 @@
django_hijack, django_nose }: django_hijack, django_nose }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-hijack-admin"; pname = "django-hijack-admin";
version = "2.1.5"; version = "2.1.10";
# the pypi packages don't include everything required for the tests # the pypi packages don't include everything required for the tests
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arteria"; owner = "arteria";
repo = "django-hijack-admin"; repo = "django-hijack-admin";
rev = "v${version}"; rev = "v${version}";
sha256 = "02j75blvkjiz5mv5wc4jxl27rgmjsrl6l67a3p8342jwazzsm6jg"; sha256 = "0m98lchp2y43886n67j4s7miyd50pg2r5r966vjnxmd7nx7qkihf";
}; };
checkInputs = [ django_nose ]; checkInputs = [ django_nose ];
@ -17,13 +17,21 @@ buildPythonPackage rec {
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
# we have to do a little bit of tinkering to convince the tests to run against the installed package, not the
# source directory
mkdir testbase
pushd testbase
mv ../runtests.py .
${python.interpreter} runtests.py hijack_admin ${python.interpreter} runtests.py hijack_admin
popd
runHook postCheck runHook postCheck
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Admin integration for django-hijack"; description = "Admin integration for django-hijack";
homepage = https://github.com/arteria/django-hijack; homepage = https://github.com/arteria/django-hijack-admin;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ lsix ]; maintainers = with maintainers; [ lsix ];
}; };

7
pkgs/development/python-modules/django-hijack/default.nix
View File

@ -3,15 +3,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-hijack"; pname = "django-hijack";
version = "2.1.9"; version = "2.1.10";
name = pname + "-" + version;
# the pypi packages don't include everything required for the tests # the pypi packages don't include everything required for the tests
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arteria"; owner = "arteria";
repo = "django-hijack"; repo = "django-hijack";
rev = "v${version}"; rev = "v${version}";
sha256 = "109xi93xj37ycdsvainybhg89pcb5sawv6w80px4r6fjvaq4732c"; sha256 = "01fwkjdzvw0yx2spwi7zc1yy64ndq1y72bfmk7kxnq5x803m2ak6";
}; };
checkInputs = [ django_nose ]; checkInputs = [ django_nose ];
@ -24,7 +23,7 @@ buildPythonPackage rec {
# source directory # source directory
mkdir testbase mkdir testbase
pushd testbase pushd testbase
cp ../runtests.py . mv ../runtests.py .
${python.interpreter} runtests.py hijack ${python.interpreter} runtests.py hijack
popd popd