b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

python: jupyter_core: 4.3.0 -> 4.4.0

Browse source
This commit is contained in:
Frederik Rietdijk 2017-12-30 12:23:58 +01:00
parent e76f06c649
commit 7a3d7cc30d
2 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/python-modules/jupyter_core/default.nix
View file

@ -11,15 +11,15 @@
buildPythonPackage rec {
pname = "jupyter_core";
version = "4.3.0";
version = "4.4.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40";
sha256 = "ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7";
};
buildInputs = [ pytest mock glibcLocales ];
checkInputs = [ pytest mock glibcLocales ];
propagatedBuildInputs = [ ipython traitlets ];
patches = [ ./tests_respect_pythonpath.patch ];

44
pkgs/development/python-modules/jupyter_core/tests_respect_pythonpath.patch
View file

@ -1,24 +1,20 @@
--- a/jupyter_core/tests/test_command.py 2016-09-13 15:22:49.000000000 +0200
+++ b/jupyter_core/tests/test_command.py 2017-10-23 12:49:27.489527705 +0200
@@ -113,7 +113,10 @@
witness = a.join(witness_cmd)
witness.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")'))
witness.chmod(0o700)
- out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': ''})
+ out = check_output(
+ [sys.executable, str(jupyter), 'witness'],
+ env={'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']}
+ )
assert b'WITNESS' in out
@@ -136,5 +139,8 @@
witness_b.write('#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")'))
witness_b.chmod(0o700)
- out = check_output([sys.executable, str(jupyter), 'witness'], env={'PATH': str(b)})
+ out = check_output(
+ [sys.executable, str(jupyter), 'witness'],
+ env={'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']}
+ )
assert b'WITNESS A' in out
--- a/jupyter_core/tests/test_command.py
+++ b/jupyter_core/tests/test_command.py
@@ -131,7 +131,7 @@ def test_not_on_path(tmpdir):
witness_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")')
write_executable(witness, witness_src)
- env = {'PATH': ''}
+ env = {'PATH': '', 'PYTHONPATH': os.environ['PYTHONPATH']}
if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614
env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT']
if sys.platform == 'win32':
@@ -157,7 +157,7 @@ def test_path_priority(tmpdir):
witness_b_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")')
write_executable(witness_b, witness_b_src)
- env = {'PATH': str(b)}
+ env = {'PATH': str(b), 'PYTHONPATH': os.environ['PYTHONPATH']}
if 'SYSTEMROOT' in os.environ: # Windows http://bugs.python.org/issue20614
env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT']
if sys.platform == 'win32':