cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #63490 from jonringer/bump_uproot

Browse source 
pythonPackages.uproot: 3.4.19 -> 3.7.0
This commit is contained in:
Dmitry Kalinkin 2019-06-19 14:25:01 -04:00 committed by GitHub
commit 7cb82ca2d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/awkward/default.nix
View file

@ -11,11 +11,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "awkward"; pname = "awkward";
version = "0.10.3"; version = "0.11.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0vq27db5k8cc5jpbdrl531gjhig0f9iy0i7z6ks81lz1a2mkvjik"; sha256 = "07m797jc5lpaj6m8469d67l2s43jf8w0mfhy0hfvbfs4mk0cjix0";
}; };
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];

7
pkgs/development/python-modules/uproot-methods/default.nix
View file

@ -6,16 +6,19 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.4.7"; version = "0.7.0";
pname = "uproot-methods"; pname = "uproot-methods";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "4a00d1db828c44d2ba35801aeff7d1ea890b7dfa337895395e3b06284c14857b"; sha256 = "0awxd4p8yr27k4iayc0phw99bxgw04dnd3lb372hj9wjvldm0hzr";
}; };
propagatedBuildInputs = [ numpy awkward ]; propagatedBuildInputs = [ numpy awkward ];
# No tests on PyPi
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/scikit-hep/uproot-methods; homepage = https://github.com/scikit-hep/uproot-methods;
description = "Pythonic mix-ins for ROOT classes"; description = "Pythonic mix-ins for ROOT classes";

42
pkgs/development/python-modules/uproot/default.nix
View file

@ -1,33 +1,49 @@
{ lib { lib, fetchPypi, buildPythonPackage, isPy27
, fetchPypi
, buildPythonPackage
, numpy
, uproot-methods
, awkward , awkward
, backports_lzma
, cachetools , cachetools
, pythonOlder , lz4
, pytestrunner , pytestrunner
, pytest , pytest
, pkgconfig , pkgconfig
, lz4
, mock , mock
, numpy
, requests , requests
, backports_lzma , uproot-methods
, xxhash
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "uproot"; pname = "uproot";
version = "3.4.19"; version = "3.7.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1df24d1f193b044cc4d6ef98e183a853655b568b7b15173d88b0d2a79e1226da"; sha256 = "0glsl57ha0d4pn5q318dmzml7crml1h8yilbhxh768wcs2030s1g";
}; };
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];
checkInputs = [ pytest pkgconfig lz4 mock requests ]
++ lib.optionals (pythonOlder "3.3") [ backports_lzma ]; checkInputs = [
propagatedBuildInputs = [ numpy cachetools uproot-methods awkward ]; lz4
mock
pkgconfig
pytest
requests
xxhash
] ++ lib.optional isPy27 backports_lzma;
propagatedBuildInputs = [
numpy
cachetools
uproot-methods
awkward
];
# skip tests which do network calls
checkPhase = ''
pytest tests -k 'not hist_in_tree and not branch_auto_interpretation'
'';
meta = with lib; { meta = with lib; {
homepage = https://github.com/scikit-hep/uproot; homepage = https://github.com/scikit-hep/uproot;