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

Merge branch 'master' into staging-next

Browse Source 
Hydra nixpkgs: ?compare=1512490
This commit is contained in:
Vladimír Čunát
2019-04-02 20:56:53 +02:00
parent ba18b47c2a ef5fd41a11
commit 2771375d6e
677 changed files with 14350 additions and 6998 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/Markups/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, python-markdown-math
, markdown
, docutils
, pygments
}:
buildPythonPackage rec {
pname = "Markups";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "1ea19458dfca6a4562044e701aa8698089a0c659fc535689ed260f89a04f8d39";
};
checkInputs = [ markdown docutils pygments ];
propagatedBuildInputs = [ python-markdown-math ];
meta = {
description = "A wrapper around various text markup languages.";
homepage = https://github.com/retext-project/pymarkups;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ klntsky ];
};
}
pkgs/development/python-modules/aioesphomeapi/default.nix
+15
View File
@@ -0,0 +1,15 @@
{ buildPythonPackage, fetchPypi, attrs, protobuf, zeroconf }:
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "1.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "16ywa7yggmsx8m2r9azdq7w9fxjh736g1vd1aibgh24g7srhwwhj";
};
propagatedBuildInputs = [ attrs protobuf zeroconf ];
meta = {};
}
pkgs/development/python-modules/amqp/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "amqp";
version = "2.4.1";
version = "2.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb";
sha256 = "043beb485774ca69718a35602089e524f87168268f0d1ae115f28b88d27f92d7";
};
checkInputs = [ pytest case pytest-sugar ];
pkgs/development/python-modules/ansible/default.nix
+2 -2
View File
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "ansible";
version = "2.7.8";
version = "2.7.9";
src = fetchurl {
url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
sha256 = "11yx7vd0mp5gkq428af141dwnrwf8f9cp3f65243qbs9icjxnrrx";
sha256 = "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf";
};
prePatch = ''
pkgs/development/python-modules/astropy/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "astropy";
version = "3.1.1";
version = "3.1.2";
disabled = !isPy3k; # according to setup.py
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "0fzm2q922qi68ns5biy807dzmgz1i9gqdh73lcafs0gfk8zyc9v5";
sha256 = "1plyx3gcsff02g4yclvhlcdj8bh1lnm98d7h6wdabl36jvnahy2a";
};
propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires
pkgs/development/python-modules/awkward/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "awkward";
version = "0.8.4";
version = "0.8.7";
src = fetchPypi {
inherit pname version;
sha256 = "7016dc02d15b8797b59a461ccc8d218f37c335b97fa6b376638c0edd4ffc9de2";
sha256 = "0a53c484za2l4yy1i05qhkylvygg8fnh4j1v3n35x2dsi929awdp";
};
nativeBuildInputs = [ pytestrunner ];
pkgs/development/python-modules/baselines/default.nix
+59
View File
@@ -0,0 +1,59 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, gym
, scipy
, tqdm
, joblib
, dill
, progressbar2
, cloudpickle
, click
, pyzmq
, tensorflow
, mpi4py
}:
buildPythonPackage rec {
pname = "baselines";
version = "0.1.5";
src = fetchPypi {
inherit pname version;
sha256 = "0n1mxkcg82gzhkb4j5zzwm335r3rc1sblknqs4x6nkrrh42d65cm";
};
patches = [
# already fixed upstream
./fix-dep-names.patch
];
propagatedBuildInputs = [
gym
scipy
tqdm
joblib
pyzmq
dill
progressbar2
mpi4py
cloudpickle
tensorflow
click
];
# fails to create a daemon, probably because of sandboxing
doCheck = false;
checkInputs = [
pytest
];
meta = with lib; {
description = "High-quality implementations of reinforcement learning algorithms";
homepage = https://github.com/openai/baselines;
license = licenses.mit;
maintainers = with maintainers; [ timokau ];
};
}
pkgs/development/python-modules/baselines/fix-dep-names.patch
+18
View File
@@ -0,0 +1,18 @@
diff --git a/setup.py b/setup.py
index bf8badc..570be20 100644
--- a/setup.py
+++ b/setup.py
@@ -10,11 +10,11 @@ setup(name='baselines',
packages=[package for package in find_packages()
if package.startswith('baselines')],
install_requires=[
- 'gym[mujoco,atari,classic_control,robotics]',
+ 'gym',
'scipy',
'tqdm',
'joblib',
- 'zmq',
+ 'pyzmq',
'dill',
'progressbar2',
'mpi4py',
pkgs/development/python-modules/beaker/default.nix
+41 -8
View File
@@ -2,42 +2,75 @@
, buildPythonPackage
, fetchFromGitHub
, nose
, pylibmc
, memcached
, redis
, pymongo
, mock
, webtest
, sqlalchemy
, pycrypto
, cryptography
, isPy27
, isPy3k
, funcsigs
, pycryptopp
}:
buildPythonPackage rec {
pname = "Beaker";
version = "1.8.0";
version = "1.10.1";
# The pypy release do not contains the tests
src = fetchFromGitHub {
owner = "bbangert";
repo = "beaker";
rev = "${version}";
sha256 = "17yfr7a307n8rdl09was4j60xqk2s0hk0hywdkigrpj4qnw0is7g";
sha256 = "0xrvg503xmi28w0hllr4s7fkap0p09fgw2wax3p1s2r6b3xjvbz7";
};
buildInputs =
[ nose
mock
webtest
];
propagatedBuildInputs = [
sqlalchemy
pycrypto
cryptography
] ++ lib.optionals (isPy27) [
funcsigs
pycryptopp
];
checkInputs = [
nose
mock
webtest
pylibmc
memcached
redis
pymongo
];
# Can not run memcached tests because it immediately tries to connect
postPatch = lib.optionalString isPy3k ''
substituteInPlace setup.py \
--replace "python-memcached" "python3-memcached"
'' + ''
rm tests/test_memcached.py
'';
# Disable external tests because they need to connect to a live database.
# Also disable a test in test_cache.py called "test_upgrade" because
# it currently fails on darwin.
# Please see issue https://github.com/bbangert/beaker/issues/166
checkPhase = ''
nosetests \
-e ".*test_ext_.*" \
-e "test_upgrade" \
-vv tests
'';
meta = {
description = "A Session and Caching library with WSGI Middleware";
maintainers = with lib.maintainers; [ garbas domenkozar ];
};
}
}
pkgs/development/python-modules/buildbot/default.nix
+19 -6
View File
@@ -1,8 +1,9 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
{ stdenv, lib, buildPythonPackage, /*fetchPypi,*/ fetchFromGitHub, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized,
glibcLocales }:
let
withPlugins = plugins: buildPythonPackage {
@@ -24,12 +25,21 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "1.8.1";
version = "2.1.0";
src = fetchPypi {
/*src = fetchPypi {
inherit pname version;
sha256 = "1zadmyrlk7p9h1akmbzwa7p90s7jwsxvdx4xn9i54dnda450m3a7";
};
sha256 = "1745hj9s0c0fcdjv6w05bma76xqg1fv42v0dslmi4d8yz9phf37w";
};*/
# Temporarily use GitHub source because PyPi archive is missing some files
# needed for the tests to pass. This has been fixed upstream.
# See: https://github.com/buildbot/buildbot/commit/30f5927cf9a80f98ed909241a149469dec3ce68d
src = fetchFromGitHub {
owner = "buildbot";
repo = "buildbot";
rev = "v${version}";
sha256 = "022ybhdvp0hp2z0cwgx7n41jyh56bpxj3fwm4z7ppzj1qhm7lb65";
} + "/master";
propagatedBuildInputs = [
# core
@@ -63,6 +73,7 @@ let
flake8
buildbot-worker
buildbot-pkg
parameterized
glibcLocales
];
@@ -84,6 +95,8 @@ let
export PATH="$out/bin:$PATH"
'';
disabled = !isPy3k;
passthru = {
inherit withPlugins;
};
pkgs/development/python-modules/buildbot/pkg.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "buildbot-pkg";
version = "1.8.1";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "16gjdzkris6475bvsgvb0v6rkn4xb6f55s468q37n0l1r6n8snc3";
sha256 = "03lv97q4pp2izjfbwfv4zmf2fyiz7jyp537bi3gc6rhfbrfgib1i";
};
postPatch = ''
pkgs/development/python-modules/buildbot/plugins.nix
+6 -5
View File
@@ -10,7 +10,8 @@
src = fetchPypi {
inherit pname version format;
sha256 = "03cgjhwpgbm0qgis1cdy9g4vc11hsrya9grcx4j35784rny7lbfl";
python = "py3";
sha256 = "011sagw8zp1z12vzkxi44w3w2lbxncz5yahkrbxj8hp6iwfzfm5v";
};
meta = with lib; {
@@ -27,7 +28,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0pfp2n4ys99jglshdrp2f6jm73c4ym3dfwl6qjvbc7y7nsi74824";
sha256 = "11gz4ry1law3l64ii383cj5fnbw9409czp2ybzkqafr4xi1qbk9h";
};
propagatedBuildInputs = [ buildbot-pkg ];
@@ -47,7 +48,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0gnxq9niw64q36dm917lhhcl8zp0wjwaamjp07zidnrb5c3pjbsz";
sha256 = "0w4iwpj1rg20fbli0ppqz70l1mc9ilg0crq8g3xrf29f9z8d1w27";
};
propagatedBuildInputs = [ buildbot-pkg ];
@@ -67,7 +68,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1b06aa8m1pzqq2d8imrq5mazc7llrlbgm7jzi8h6jjd2gahdjgz5";
sha256 = "0xyvxamw45qhnfml3x5hfg9nai1jhdwbmq4pm8csf3ad0cw6vqya";
};
propagatedBuildInputs = [ buildbot-pkg ];
@@ -87,7 +88,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1v8411bw0cs206vwfnqx1na7dzg77h9aff4wlm11hkbdsy9ayv2d";
sha256 = "1szcrx8vslskifzxaq7lrfg2arilaq1w1aqr0nc8pjclj7idp92c";
};
propagatedBuildInputs = [ buildbot-pkg ];
pkgs/development/python-modules/buildbot/worker.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage (rec {
pname = "buildbot-worker";
version = "1.8.1";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1rh73jbyms4b9wgkkdzcn80xfd18p8rn89rw4rsi2002ydrc7n39";
sha256 = "14qimaf513h2hklcpix8vscrawvr1qiyn1vy88ycpsbz9mcqbhps";
};
propagatedBuildInputs = [ twisted future ];
pkgs/development/python-modules/cartopy/default.nix
+10 -3
View File
@@ -25,12 +25,19 @@ buildPythonPackage rec {
-k "not test_nightshade_image"
'';
buildInputs = [ cython glibcLocales ];
LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [
cython
geos # for geos-config
proj
];
buildInputs = [
geos proj
];
propagatedBuildInputs = [
# required
six pyshp shapely geos proj numpy
six pyshp shapely numpy
# optional
gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib
pkgs/development/python-modules/cassandra-driver/default.nix
+2 -2
View File
@@ -21,11 +21,11 @@
buildPythonPackage rec {
pname = "cassandra-driver";
version = "3.16.0";
version = "3.17.0";
src = fetchPypi {
inherit pname version;
sha256 = "1gjs2lqy0ba6zhh13a1dhirk59i7lc4zcbl7h50619hdm5kv3g22";
sha256 = "1z49z6f9rj9kp1v03s1hs1rg8cj49rh0yk0fc2qi57w7slgy2hkd";
};
buildInputs = [
pkgs/development/python-modules/celery/default.nix
+7 -2
View File
@@ -4,13 +4,18 @@
buildPythonPackage rec {
pname = "celery";
version = "4.3.0rc1";
version = "4.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "1jmg47l0b3bnwmg44x48bwziwyk6xqs1y5plvr99a3ikz1l807yf";
sha256 = "4c4532aa683f170f40bd76f928b70bc06ff171a959e06e71bf35f2f9d6031ef9";
};
postPatch = ''
substituteInPlace requirements/test.txt \
--replace "pytest>=4.3.1,<4.4.0" pytest
'';
# make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
preCheck = stdenv.lib.optionalString stdenv.isLinux ''
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
pkgs/development/python-modules/chameleon/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "Chameleon";
version = "3.5";
version = "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1a83jf211mqjhgbd3abqyrn4mp4vb077ql8fydmv80xg3whrf3yb";
sha256 = "0141kfwx553q73wzfl624pppmbhh7fpzvaj5pbj21pqlk2rhfx75";
};
meta = with stdenv.lib; {
pkgs/development/python-modules/cherrypy/17.nix
+36
View File
@@ -0,0 +1,36 @@
{ lib, buildPythonPackage, fetchPypi
, setuptools_scm
, cheroot, contextlib2, portend, routes, six, zc_lockfile
, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt
}:
buildPythonPackage rec {
pname = "cherrypy";
version = "17.4.1";
src = fetchPypi {
pname = "CherryPy";
inherit version;
sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
};
propagatedBuildInputs = [
cheroot contextlib2 portend routes six zc_lockfile
];
nativeBuildInputs = [ setuptools_scm ];
checkInputs = [
backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt
];
checkPhase = ''
pytest
'';
meta = with lib; {
homepage = https://www.cherrypy.org;
description = "A pythonic, object-oriented HTTP framework";
license = licenses.bsd3;
};
}
pkgs/development/python-modules/cherrypy/default.nix
+16 -30
View File
@@ -1,54 +1,40 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
, cheroot, contextlib2, portend, routes, six
, setuptools_scm, zc_lockfile, more-itertools
, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
, backports_functools_lru_cache, requests_toolbelt, pytest-services
, setuptools_scm
, cheroot, portend, more-itertools, zc_lockfile, routes
, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services
}:
let
srcInfo = if isPy3k then {
version = "18.1.0";
sha256 = "4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615";
} else {
version = "17.4.1";
sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
};
in buildPythonPackage rec {
pname = "CherryPy";
inherit (srcInfo) version;
buildPythonPackage rec {
pname = "cherrypy";
version = "18.1.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname;
inherit (srcInfo) version sha256;
pname = "CherryPy";
inherit version;
sha256 = "6585c19b5e4faffa3613b5bf02c6a27dcc4c69a30d302aba819639a2af6fa48b";
};
propagatedBuildInputs = if isPy3k then [
propagatedBuildInputs = [
# required
cheroot portend more-itertools zc_lockfile
# optional
routes
] else [
cheroot contextlib2 portend routes six zc_lockfile
];
buildInputs = [ setuptools_scm ];
nativeBuildInputs = [ setuptools_scm ];
checkInputs = if isPy3k then [
checkInputs = [
objgraph pytest pytestcov pathpy requests_toolbelt pytest-services
] else [
backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt
];
checkPhase = ''
# 3 out of 5 SignalHandlingTests need network access
# test_2_File_Concurrency also fails upstream: https://github.com/cherrypy/cherrypy/issues/1306
# ...and skipping it makes 2 other tests fail
LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload \
and not test_2_File_Concurrency and not test_3_Redirect and not test_4_File_deletion"
pytest
'';
meta = with lib; {
homepage = "http://www.cherrypy.org";
homepage = https://www.cherrypy.org;
description = "A pythonic, object-oriented HTTP framework";
license = licenses.bsd3;
};
pkgs/development/python-modules/contextvars/default.nix
+2 -4
View File
@@ -2,16 +2,14 @@
buildPythonPackage rec {
pname = "contextvars";
version = "2.3";
version = "2.4";
disabled = !isPy36;
src = fetchPypi {
inherit pname version;
sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93";
sha256 = "f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e";
};
# pull request for this patch is https://github.com/MagicStack/contextvars/pull/9
patches = [ ./immutables_version.patch ];
propagatedBuildInputs = [ immutables ];
meta = {
pkgs/development/python-modules/contextvars/immutables_version.patch
-11
View File
@@ -1,11 +0,0 @@
--- ./setup.py 2018-07-30 15:40:14.000000000 +0000
+++ ./setup.py 2019-02-12 18:33:24.984430303 +0000
@@ -17,7 +17,7 @@
packages=['contextvars'],
provides=['contextvars'],
install_requires=[
- 'immutables==0.6',
+ 'immutables>=0.6',
],
license='Apache License, Version 2.0',
classifiers=[
pkgs/development/python-modules/cssselect2/default.nix
+14 -4
View File
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }:
{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner }:
buildPythonPackage rec {
pname = "cssselect2";
@@ -9,11 +9,21 @@ buildPythonPackage rec {
sha256 = "505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab";
};
# We're not interested in code quality tests
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-cov" "" \
--replace "pytest-flake8" "" \
--replace "pytest-isort" ""
substituteInPlace setup.cfg \
--replace "--cov=cssselect2" "" \
--replace "--flake8" "" \
--replace "--isort" ""
'';
propagatedBuildInputs = [ tinycss2 ];
checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ];
LC_ALL = "en_US.UTF-8";
checkInputs = [ pytest pytestrunner ];
meta = with lib; {
description = "CSS selectors for Python ElementTree";
pkgs/development/python-modules/djangorestframework/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, django }:
buildPythonPackage rec {
version = "3.9.1";
version = "3.9.2";
pname = "djangorestframework";
src = fetchPypi {
inherit pname version;
sha256 = "79c6efbb2514bc50cf25906d7c0a5cfead714c7af667ff4bd110312cd380ae66";
sha256 = "05sam4z69mypxk8fv415zvs8mp09jqsagmslrbs1qvk51lk6d8pp";
};
# Test settings are missing
pkgs/development/python-modules/dlib/default.nix
+6 -1
View File
@@ -1,12 +1,17 @@
{ buildPythonPackage, dlib, python, pytest }:
{ buildPythonPackage, dlib, python, pytest, avxSupport ? true }:
buildPythonPackage {
inherit (dlib) name src nativeBuildInputs buildInputs meta;
# although AVX can be enabled, we never test with it. Some Hydra machines
# fail because of this, however their build results are probably used on hardware
# with AVX support.
checkPhase = ''
${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS
'';
setupPyBuildFlags = [ "--${if avxSupport then "yes" else "no"} USE_AVX_INSTRUCTIONS" ];
patches = [ ./build-cores.patch ];
checkInputs = [ pytest ];
pkgs/development/python-modules/dnslib/default.nix
+20
View File
@@ -0,0 +1,20 @@
{ lib, python, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "dnslib";
version = "0.9.9";
src = fetchPypi {
inherit pname version;
sha256 = "0w8spp4fnw63xx9zj77zvgk1qabd97ifrj6gap2j36gydnarr42c";
};
checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh";
meta = with lib; {
description = "Simple library to encode/decode DNS wire-format packets";
license = licenses.bsd2;
homepage = https://bitbucket.org/paulc/dnslib/;
maintainers = with maintainers; [ delroth ];
};
}
pkgs/development/python-modules/face_recognition/default.nix
+12 -3
View File
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "face_recognition";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
repo = pname;
owner = "ageitgey";
rev = "v${version}";
sha256 = "17jnyr80j1p74gyvh1jabvwd3zsxvip2y7cjhh2g6gsjv2dpvrjv";
rev = "634db2e4309a365cee2503cb65d6f2e88f519d1e";
sha256 = "06zw5hq417d5yp17zynhxhb73074lx2qy64fqfzf711rw5vrn2mx";
};
postPatch = ''
@@ -19,6 +19,15 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ];
# Our dlib is compiled with AVX instructions by default which breaks
# with "Illegal instruction" on some builders due to missing hardware features.
#
# As this makes the build fairly unreliable, it's better to skip the test and to ensure that
# the build is working and after each change to the package, manual testing should be done.
doCheck = false;
# Although tests are disabled by default, checkPhase still exists, so
# maintainers can check the package's functionality locally before modifying it.
checkInputs = [ flake8 pytest glibcLocales ];
checkPhase = ''
LC_ALL="en_US.UTF-8" py.test
pkgs/development/python-modules/flake8-import-order/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "flake8-import-order";
version = "0.18";
version = "0.18.1";
src = fetchPypi {
inherit pname version;
sha256 = "9be5ca10d791d458eaa833dd6890ab2db37be80384707b0f76286ddd13c16cbf";
sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2";
};
propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34;
pkgs/development/python-modules/folium/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "folium";
version = "0.7.0";
version = "0.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "04mhdl3k644j45rlfkamxz1paf58fxrmnwgvkrvza2fcwcs4nr9n";
sha256 = "0f25fhwxnix8hddzf67barzjwwsvpww112zisrvz2lpl08j388rn";
};
checkInputs = [ pytest nbconvert pandas mock ];
pkgs/development/python-modules/gym/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "gym";
version = "0.11.0";
version = "0.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "f9c79fc295b8b20cfda5ab0a671e72c95615dc77517ae414f8f8b10e9375f155";
sha256 = "0ggac8a8qk06wplwg5xsisn9id3lis9qslri7m9rz22khlyl7z4j";
};
propagatedBuildInputs = [
pkgs/development/python-modules/irc/default.nix
+3 -1
View File
@@ -1,6 +1,7 @@
{ buildPythonPackage, fetchPypi, isPy3k
, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools
, setuptools_scm }:
, setuptools_scm, jaraco_collections
}:
buildPythonPackage rec {
pname = "irc";
@@ -23,5 +24,6 @@ buildPythonPackage rec {
jaraco_stream
pytz
jaraco_itertools
jaraco_collections
];
}
pkgs/development/python-modules/isort/default.nix
+10 -8
View File
@@ -1,22 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, futures, mock, pytest }:
{ lib, buildPythonPackage, fetchPypi, isPy27, futures, backports_functools_lru_cache, mock, pytest }:
buildPythonPackage rec {
let
skipTests = lib.optional isPy27 "test_standard_library_deprecates_user_issue_778";
testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests;
in buildPythonPackage rec {
pname = "isort";
version = "4.3.4";
version = "4.3.16"; # Note 4.x is the last version that supports Python2
src = fetchPypi {
inherit pname version;
sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r";
sha256 = "1v6lapqhc33rxr9698lqjyb49fis27i42p3ymngrw95py3qf7y08";
};
propagatedBuildInputs = lib.optional isPy27 futures;
propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ];
checkInputs = [ mock pytest ];
# isort excludes paths that contain /build/, so test fixtures don't work with TMPDIR=/build/
checkPhase = ''
py.test test_isort.py -k "not test_long_line_comments \
and not test_import_case_produces_inconsistent_results_issue_472 \
and not test_no_extra_lines_issue_557"
PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts}
'';
meta = with lib; {
pkgs/development/python-modules/jaraco_collections/default.nix
+3 -2
View File
@@ -1,5 +1,6 @@
{ buildPythonPackage, fetchPypi, setuptools_scm
, six, jaraco_classes }:
, six, jaraco_classes, jaraco_text
}:
buildPythonPackage rec {
pname = "jaraco.collections";
@@ -11,7 +12,7 @@ buildPythonPackage rec {
doCheck = false;
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ six jaraco_classes ];
propagatedBuildInputs = [ six jaraco_classes jaraco_text ];
# break dependency cycle
patchPhase = ''
pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch
+38
View File
@@ -0,0 +1,38 @@
From fcffcc61e432e5250e7fbfb1ecbe0f1cac3006cf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Mar 2019 13:10:18 +0100
Subject: [PATCH] Don't run flake8 checks during the build
If the code simply violates their code style, the Nix package shouldn't fail.
---
pytest.ini | 2 +-
setup.cfg | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/pytest.ini b/pytest.ini
index d165e5e..d8e4694 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
[pytest]
norecursedirs=dist build .tox .eggs
-addopts=--doctest-modules --flake8
+addopts=--doctest-modules
doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES
filterwarnings=
ignore:Possible nested set::pycodestyle:113
diff --git a/setup.cfg b/setup.cfg
index 9f3517f..c9033ec 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,7 +30,6 @@ setup_requires = setuptools_scm >= 1.15.0
testing =
pytest >= 3.5, !=3.7.3
pytest-checkdocs
- pytest-flake8
docs =
sphinx
jaraco.packaging >= 3.2
--
2.18.1
pkgs/development/python-modules/jaraco_itertools/default.nix
+5 -2
View File
@@ -1,5 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, setuptools_scm
, inflect, more-itertools, six, pytest, pytest-flake8 }:
, inflect, more-itertools, six, pytest
}:
buildPythonPackage rec {
pname = "jaraco.itertools";
@@ -10,9 +11,11 @@ buildPythonPackage rec {
sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae";
};
patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ inflect more-itertools six ];
checkInputs = [ pytest pytest-flake8 ];
checkInputs = [ pytest ];
checkPhase = ''
pytest
pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch
+38
View File
@@ -0,0 +1,38 @@
From 4b9801d9bbe535fd6719933b96278915573e3595 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 10 Mar 2019 16:42:21 +0100
Subject: [PATCH] Don't run flake8 checks during the build
If the code simply violates their code style, the Nix package shouldn't fail.
---
pytest.ini | 2 +-
setup.cfg | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/pytest.ini b/pytest.ini
index 9b3c1ec..a5189c1 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
[pytest]
norecursedirs=dist build .tox .eggs
-addopts=--doctest-modules --flake8
+addopts=--doctest-modules
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
filterwarnings=
ignore:Possible nested set::pycodestyle:113
diff --git a/setup.cfg b/setup.cfg
index 3e7bbed..5cac7a2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,6 @@ setup_requires = setuptools_scm >= 1.15.0
testing =
pytest >= 3.5, !=3.7.3
pytest-checkdocs
- pytest-flake8
docs =
sphinx
jaraco.packaging >= 3.2
--
2.18.1
pkgs/development/python-modules/jaraco_logging/default.nix
+5 -2
View File
@@ -1,5 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, setuptools_scm
, tempora, six, pytest, pytest-flake8 }:
, tempora, six, pytest
}:
buildPythonPackage rec {
pname = "jaraco.logging";
@@ -10,9 +11,11 @@ buildPythonPackage rec {
sha256 = "1lb846j7qs1hgqwkyifv51nhl3f8jimbc4lk8yn9nkaynw0vyzcg";
};
patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ tempora six ];
checkInputs = [ pytest pytest-flake8 ];
checkInputs = [ pytest ];
checkPhase = ''
PYTHONPATH=".:$PYTHONPATH" pytest
pkgs/development/python-modules/jaraco_text/default.nix
+5 -4
View File
@@ -1,14 +1,15 @@
{ buildPythonPackage, fetchPypi, setuptools_scm
, jaraco_functools, jaraco_collections }:
, jaraco_functools
}:
buildPythonPackage rec {
pname = "jaraco.text";
version = "2.0";
version = "3.0";
src = fetchPypi {
inherit pname version;
sha256 = "3660678d395073626e72a455b24bacf07c064138a4cc6c1dae63e616f22478aa";
sha256 = "1l5hq2jvz9xj05aayc42f85v8wx8rpi16lxph8blw51wgnvymsyx";
};
doCheck = false;
buildInputs =[ setuptools_scm ];
propagatedBuildInputs = [ jaraco_functools jaraco_collections ];
propagatedBuildInputs = [ jaraco_functools ];
}
pkgs/development/python-modules/joblib/default.nix
+23 -8
View File
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, fetchpatch
, sphinx
, numpydoc
, pytest
@@ -10,16 +11,30 @@
buildPythonPackage rec {
pname = "joblib";
version = "0.12.4";
version = "0.13.2";
# get full repository inorder to run tests
src = fetchFromGitHub {
owner = "joblib";
repo = pname;
rev = version;
sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb";
src = fetchPypi {
inherit pname version;
sha256 = "315d6b19643ec4afd4c41c671f9f2d65ea9d787da093487a81ead7b0bac94524";
};
# python-lz4 compatibility
# https://github.com/joblib/joblib/pull/847
patches = [
(fetchpatch {
url = https://github.com/joblib/joblib/commit/d3235fd601f40c91e074d48a411d7380329fe155.patch;
sha256 = "1hg1vfbba7mfilrpvmd97s68v03vs4bhlp1c1dj9lizi51mj2q2h";
})
(fetchpatch {
url = https://github.com/joblib/joblib/commit/884c92cd2aa5c2c1975ab48786da75556d779833.patch;
sha256 = "11kvpkvi428dq13ayy7vfyrib8isvcrdw8cd5hxkp5axr7sl12ba";
})
(fetchpatch {
url = https://github.com/joblib/joblib/commit/f1e177d781cc0d64420ec964a0b17d8268cb42a0.patch;
sha256 = "1sq6wcw4bhaq8cqwcd43fdws3467qy342xx3pgv62hp2nn75a21d";
})
];
checkInputs = [ sphinx numpydoc pytest ];
propagatedBuildInputs = [ python-lz4 ];
pkgs/development/python-modules/jupyterhub/default.nix
+2 -1
View File
@@ -13,6 +13,7 @@
, tornado
, traitlets
, requests
, notebook
, pythonOlder
, nodePackages
}:
@@ -106,7 +107,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado
traitlets prometheus_client async_generator
traitlets prometheus_client async_generator notebook
];
# Disable tests because they take an excessive amount of time to complete.
pkgs/development/python-modules/kombu/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "kombu";
version = "4.3.0";
version = "4.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "529df9e0ecc0bad9fc2b376c3ce4796c41b482cf697b78b71aea6ebe7ca353c8";
sha256 = "389ba09e03b15b55b1a7371a441c894fd8121d174f5583bbbca032b9ea8c9edd";
};
postPatch = ''
pkgs/development/python-modules/lark-parser/default.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "lark-parser";
version = "0.6.5";
version = "0.6.6";
src = fetchFromGitHub {
owner = "lark-parser";
repo = "lark";
rev = version;
sha256 = "0mf10xm9blqik8mwrpw0r07vqlk2y4r98yqvk1sq849zqlxmqpsr";
sha256 = "0kaiw8zzzcp92p6mzm9zkyhv578p0x4lzjsyl8b4rnsafplmbscs";
};
checkPhase = ''
pkgs/development/python-modules/libgpuarray/default.nix
+2 -1
View File
@@ -66,8 +66,9 @@ buildPythonPackage rec {
enableParallelBuilding = true;
nativeBuildInputs = [ cmake ];
buildInputs = [
cmake
cython
nose
];
pkgs/development/python-modules/matplotlib/2.nix
+2 -1
View File
@@ -5,7 +5,8 @@
, enableGhostscript ? false, ghostscript ? null, gtk3
, enableGtk2 ? false, pygtk ? null, gobject-introspection
, enableGtk3 ? false, cairo
, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
# darwin has its own "MacOSX" backend
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableQt ? false, pyqt4
, libcxx
, Cocoa
pkgs/development/python-modules/matplotlib/default.nix
+2 -1
View File
@@ -4,7 +4,8 @@
, enableGhostscript ? true, ghostscript ? null, gtk3
, enableGtk2 ? false, pygtk ? null, gobject-introspection
, enableGtk3 ? false, cairo
, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
# darwin has its own "MacOSX" backend
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableQt ? false, pyqt4
, libcxx
, Cocoa
pkgs/development/python-modules/minio/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi
, urllib3, python-dateutil , pytz, faker, mock, nose }:
buildPythonPackage rec {
pname = "minio";
version = "4.0.13";
src = fetchPypi {
inherit pname version;
sha256 = "1sbmv1lskm5cs3jmn8f2688pimgibly16g8ycc6fgnsjanyby35l";
};
disabled = !isPy3k;
checkInputs = [ faker mock nose ];
propagatedBuildInputs = [ urllib3 python-dateutil pytz ];
meta = with lib; {
description = "Simple APIs to access any Amazon S3 compatible object storage server";
homepage = https://github.com/minio/minio-py;
maintainers = with maintainers; [ peterromfeldhk ];
license = licenses.asl20;
};
}
pkgs/development/python-modules/nevow/default.nix
+2
View File
@@ -12,6 +12,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ twisted ];
checkInputs = [ twisted ];
checkPhase = ''
trial formless nevow
'';
pkgs/development/python-modules/osmnx/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "osmnx";
version = "0.8.1";
version = "0.9";
src = fetchFromGitHub {
owner = "gboeing";
repo = pname;
rev = "v${version}";
sha256 = "1pn2v3dhbmb0yhqif9padg7x3sdx27pgfr95i3kxj4v0yrviaf9k";
sha256 = "1k3y5kl4k93vxaxyanc040x44s2fyyc3m1ndy2j3kg0037z8ad4z";
};
propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ];
pkgs/development/python-modules/pivy/default.nix
+6 -1
View File
@@ -16,8 +16,13 @@ buildPythonPackage rec {
sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf";
};
nativeBuildInputs = with pkgs; [
swig1 coin3d soqt
];
buildInputs = with pkgs; with xorg; [
swig1 coin3d soqt libGLU_combined
coin3d soqt
libGLU_combined
libXi libXext libSM libICE libX11
];
pkgs/development/python-modules/py3status/default.nix
+6 -2
View File
@@ -5,6 +5,10 @@
, requests
, pytz
, tzlocal
, i3ipc
, pydbus
, pygobject3
, pyserial
, file
, acpi
@@ -20,14 +24,14 @@
buildPythonPackage rec {
pname = "py3status";
version = "3.16";
src = fetchPypi {
inherit pname version;
sha256 = "1xrfph277bgjln3jbpzpgkhxad04fjvj7s3xfil42q1sxi4s3q3g";
};
doCheck = false;
propagatedBuildInputs = [ pytz requests tzlocal ];
propagatedBuildInputs = [ pytz requests tzlocal i3ipc pydbus pygobject3 pyserial ];
buildInputs = [ file ];
prePatch = ''
sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py
pkgs/development/python-modules/pyarrow/default.nix
+9 -2
View File
@@ -16,6 +16,7 @@ buildPythonPackage rec {
checkInputs = [ hypothesis pandas pytest ];
PYARROW_BUILD_TYPE = "release";
PYARROW_WITH_PARQUET = true;
PYARROW_CMAKE_OPTIONS = [
"-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"
@@ -24,6 +25,10 @@ buildPythonPackage rec {
"-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
];
preBuild = ''
export PYARROW_PARALLEL=$NIX_BUILD_CORES
'';
preCheck = ''
rm pyarrow/tests/test_jvm.py
rm pyarrow/tests/test_hdfs.py
@@ -43,13 +48,15 @@ buildPythonPackage rec {
# when it is not intended to be imported at all
rm pyarrow/tests/deserialize_buffer.py
substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled"
# Fails to bind a socket
# "PermissionError: [Errno 1] Operation not permitted"
substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled"
'';
ARROW_HOME = _arrow-cpp;
PARQUET_HOME = _arrow-cpp;
setupPyBuildFlags = ["--with-parquet" ];
checkPhase = ''
mv pyarrow/tests tests
rm -rf pyarrow
pkgs/development/python-modules/pybullet/default.nix
+34
View File
@@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, libGLU_combined
, xorg
}:
buildPythonPackage rec {
pname = "pybullet";
version = "2.4.8";
src = fetchPypi {
inherit pname version;
sha256 = "0b6dkrac5zydxqfrf827xhamsimychrn77dsfnz1kf7c1crlwcw9";
};
buildInputs = [
libGLU_combined
xorg.libX11
];
patches = [
# make sure X11 and OpenGL can be found at runtime
./static-libs.patch
];
meta = with lib; {
description = "Open-source software for robot simulation, integrated with OpenAI Gym";
homepage = https://pybullet.org/;
license = licenses.zlib;
maintainers = with maintainers; [ timokau ];
platforms = platforms.linux;
};
}
pkgs/development/python-modules/pybullet/static-libs.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/setup.py b/setup.py
index 98efabdbf..e69e79084 100644
--- a/setup.py
+++ b/setup.py
@@ -563,6 +563,8 @@ print("-----")
extensions = []
+libraries += [ "X11", "GL" ] # statically link x11 and opengl
+
pybullet_ext = Extension("pybullet",
sources = sources,
libraries = libraries,
pkgs/development/python-modules/pyhocon/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
# Runtime inputs:
, pyparsing
# Check inputs:
, pytest
, mock
}:
buildPythonPackage rec {
pname = "pyhocon";
version = "0.3.51";
src = fetchPypi {
inherit pname version;
sha256 = "10l014br012fa583rnj3wqf6g9gmljamcwpw4snqwwg15i0dmkll";
};
propagatedBuildInputs = [ pyparsing ];
checkInputs = [ pytest mock ];
# Tests fail because necessary data files aren't packaged for PyPi yet.
# See https://github.com/chimpler/pyhocon/pull/203
doCheck = false;
meta = with lib; {
homepage = https://github.com/chimpler/pyhocon/;
description = "HOCON parser for Python";
# Long description copied from
# https://github.com/chimpler/pyhocon/blob/55a9ea3ebeeac5764bdebebfbeacbf099f64db26/setup.py
# (the tip of master as of 2019-03-24).
longDescription = ''
A HOCON parser for Python. It additionally provides a tool
(pyhocon) to convert any HOCON content into json, yaml and properties
format
'';
license = licenses.asl20;
maintainers = [ maintainers.chreekat ];
};
}
pkgs/development/python-modules/pyramid_beaker/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ buildPythonPackage rec {
py.test -k 'not test_includeme' pyramid_beaker/tests.py
'';
buildInputs = [ pytest ];
checkInputs = [ pytest ];
propagatedBuildInputs = [ beaker pyramid ];
pkgs/development/python-modules/pyshp/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
, setuptools }:
buildPythonPackage rec {
version = "2.0.1";
version = "2.1.0";
pname = "pyshp";
src = fetchPypi {
inherit pname version;
sha256 = "049xj760s75nkvs7rhz710a6x3lvvfajddknmfz1vkf2p3f2l2as";
sha256 = "1h75a5fisqqj48m6wq7jhdxv6arjg3mvnr5q404pvfbjscj7yp76";
};
buildInputs = [ setuptools ];
pkgs/development/python-modules/pyside/tools.nix
+5 -1
View File
@@ -13,7 +13,11 @@ buildPythonPackage rec {
enableParallelBuilding = true;
buildInputs = [ cmake pyside qt4 pysideShiboken ];
nativeBuildInputs = [ cmake ];
buildInputs = [ qt4 ];
propagatedBuildInputs = [ pyside pysideShiboken ];
meta = {
description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
pkgs/development/python-modules/pytest-faulthandler/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "bf8634c3fd6309ef786ec03b913a5366163fdb094ebcfdebc35626400d790e0d";
};
buildInputs = [ setuptools_scm pytest ];
nativeBuildInputs = [ setuptools_scm pytest ];
checkInputs = [ pytest-mock ];
propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler;
pkgs/development/python-modules/pytest-mock/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytest-mock";
version = "1.10.1";
version = "1.10.2";
src = fetchPypi {
inherit pname version;
sha256 = "4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4";
sha256 = "cbec53e7cb0f2b57275220cb4f2822093ac89e486095555105ffe1a4e2f11df4";
};
propagatedBuildInputs = lib.optional (!isPy3k) mock;
pkgs/development/python-modules/python-markdown-math/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
, markdown
}:
buildPythonPackage rec {
pname = "python-markdown-math";
version = "0.6";
src = fetchPypi {
inherit pname version;
sha256 = "c68d8cb9695cb7b435484403dc18941d1bad0ff148e4166d9417046a0d5d3022";
};
checkInputs = [ markdown ];
meta = {
description = "Math extension for Python-Markdown";
homepage = https://github.com/mitya57/python-markdown-math;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ klntsky ];
};
}
pkgs/development/python-modules/quandl/default.nix
+2 -2
View File
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "quandl";
version = "3.4.5";
version = "3.4.6";
src = fetchPypi {
inherit version;
pname = "Quandl";
sha256 = "1rflyc6q3wa5ghc5v81yw79yg7lkpgd2c22mgbb0cvza724k53ys";
sha256 = "15b58nj45bdax0aha6kwjz5pxj3bz8bs6ajwxqp9r89j13xxn94g";
};
doCheck = true;
pkgs/development/python-modules/restructuredtext_lint/default.nix
+2 -5
View File
@@ -9,14 +9,11 @@
buildPythonPackage rec {
pname = "restructuredtext_lint";
version = "1.2.2";
# https://github.com/twolfson/restructuredtext-lint/pull/47
disabled = isPy37;
version = "1.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350";
sha256 = "97b3da356d5b3a8514d8f1f9098febd8b41463bed6a1d9f126cf0a048b6fd908";
};
checkInputs = [ nose testtools ];
pkgs/development/python-modules/roboschool/default.nix
+73
View File
@@ -0,0 +1,73 @@
{ lib
, buildPythonPackage
, python
, fetchFromGitHub
, fetchpatch
, qt5
, boost
, assimp
, gym
, bullet-roboschool
, pkgconfig
, which
}:
buildPythonPackage rec {
pname = "roboschool";
version = "1.0.39";
src = fetchFromGitHub {
owner = "openai";
repo = "roboschool";
rev = version;
sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh";
};
propagatedBuildInputs = [
gym
];
nativeBuildInputs = [
pkgconfig
qt5.qtbase # needs the `moc` tool
which
];
buildInputs = [
bullet-roboschool
assimp
qt5.qtbase
boost
];
NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}";
patches = [
# Remove kwarg that was removed in upstream gym
# https://github.com/openai/roboschool/pull/180
(fetchpatch {
name = "remove-close-kwarg.patch";
url = "https://github.com/openai/roboschool/pull/180/commits/334f489c8ce7af4887e376139ec676f89da5b16f.patch";
sha256 = "0bbz8b63m40a9lrwmh7c8d8gj9kpa8a7svdh08qhrddjkykvip6r";
})
];
preBuild = ''
# First build the cpp dependencies
cd roboschool/cpp-household
make \
MOC=moc \
-j$NIX_BUILD_CORES
cd ../..
'';
# Does a QT sanity check, but QT is not expected to work in isolation
doCheck = false;
meta = with lib; {
description = "Open-source software for robot simulation, integrated with OpenAI Gym";
homepage = https://github.com/openai/roboschool;
license = licenses.mit;
maintainers = with maintainers; [ timokau ];
};
}
pkgs/development/python-modules/shellingham/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "shellingham";
version = "1.2.8";
version = "1.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "115k1z2klgsvyzg4q5ip0iqxyb565pkchhf2fsr846k68gqcgrjn";
sha256 = "116r78nhw74rh857kv9l614xjr6k89919s6l8b14hlvy8fz8rg51";
};
meta = with stdenv.lib; {
pkgs/development/python-modules/shodan/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "shodan";
version = "1.10.4";
version = "1.11.1";
src = fetchPypi {
inherit pname version;
sha256 = "13966vqxww7v2b5hf2kjismdzvqyjvxlcdvpkzpbsrpxy9pvn2n4";
sha256 = "0kjcyw3xmps3maf4vzn1pypc6i60q8b67xj78v4gbv4yx2cp2fzr";
};
propagatedBuildInputs = [
pkgs/development/python-modules/snakeviz/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "snakeviz";
version = "1.0.0";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "5fe23667708a4ed04047abfbf209675a8488ea6ea8c038d7de06d8a083fb3531";
sha256 = "0hvfc7c25cz6p3m3p3klm3njiysp7lkrs9sxm4p40spldl0jlfpa";
};
# Upstream doesn't run tests from setup.py
pkgs/development/python-modules/thinc/default.nix
+4 -1
View File
@@ -63,7 +63,10 @@ buildPythonPackage rec {
substituteInPlace setup.py \
--replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \
--replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \
--replace "msgpack-numpy<0.4.4" "msgpack-numpy"
--replace "msgpack-numpy<0.4.4" "msgpack-numpy" \
--replace "wheel>=0.32.0,<0.33.0" "wheel" \
--replace "wrapt>=1.10.0,<1.11.0" "wrapt" \
--replace "msgpack>=0.5.6,<0.6.0" "msgpack"
'';
# Cannot find cython modules.
pkgs/development/python-modules/vine/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "vine";
version = "1.2.0";
version = "1.3.0";
disable = pythonOlder "2.7";
src = fetchPypi {
inherit pname version;
sha256 = "0xjz2sjbr5jrpjk411b7alkghdskhphgsqqrbi7abqfh2pli6j7f";
sha256 = "133ee6d7a9016f177ddeaf191c1f58421a1dcc6ee9a42c58b34bed40e1d2cd87";
};
buildInputs = [ case pytest ];
pkgs/development/python-modules/werkzeug/default.nix
+4 -4
View File
@@ -4,18 +4,18 @@
buildPythonPackage rec {
pname = "Werkzeug";
version = "0.14.1";
version = "0.15.1";
src = fetchPypi {
inherit pname version;
sha256 = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c";
sha256 = "ca5c2dcd367d6c0df87185b9082929d255358f5391923269335782b213d52655";
};
propagatedBuildInputs = [ itsdangerous ];
checkInputs = [ pytest requests glibcLocales hypothesis ];
checkInputs = [ pytest requests hypothesis ];
checkPhase = ''
LC_ALL="en_US.UTF-8" py.test ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"}
pytest ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"}
'';
meta = with stdenv.lib; {
pkgs/development/python-modules/xdot/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3 }:
, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3, gtk3 }:
buildPythonPackage rec {
pname = "xdot";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
disabled = !isPy3k;
nativeBuildInputs = [ wrapGAppsHook ];
propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gnome3.gtk ];
propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ];
meta = with lib; {
description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";