Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-10-08 21:47:26 +02:00
181 changed files with 11059 additions and 4669 deletions

View File

@@ -1,20 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python
, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens
, brotli, fontmath, mutatormath, booleanoperations
, ufoprocessor, ufonormalizer, psautohint, tqdm
, ufoprocessor, ufonormalizer, psautohint
, setuptools_scm
, pytest
}:
buildPythonPackage rec {
pname = "afdko";
version = "3.5.1";
version = "3.5.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw";
sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck";
};
nativeBuildInputs = [ setuptools_scm ];
@@ -35,7 +35,6 @@ buildPythonPackage rec {
ufoprocessor
ufonormalizer
psautohint
tqdm
];
# tests are broken on non x86_64

View File

@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pyyaml
, python-dateutil, requests, pymongo, raven, bcrypt, flask, pyjwt, flask-cors, psycopg2, pytz, flask-compress, jinja2
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
, bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk
}:
buildPythonPackage rec {
@@ -11,7 +11,23 @@ buildPythonPackage rec {
sha256 = "894d240c51428225264867a80094b9743d71272635a18ddfefa5832b61fed2c6";
};
propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml];
propagatedBuildInputs = [
bcrypt
blinker
flask
flask-compress
flask-cors
mohawk
psycopg2
pyjwt
pymongo
python-dateutil
pytz
pyyaml
requests
requests-hawk
sentry-sdk
];
doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k }:
{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }:
buildPythonPackage rec {
pname = "avro-python3";
@@ -10,6 +10,7 @@ buildPythonPackage rec {
sha256 = "a455c215540b1fceb1823e2a918e94959b54cb363307c97869aa46b5b55bde05";
};
buildInputs = [ pycodestyle isort ];
doCheck = false; # No such file or directory: './run_tests.py
meta = with lib; {

View File

@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, msrestazure
, azure-common
, azure-mgmt-nspkg
@@ -8,34 +8,39 @@
, isPy3k
}:
buildPythonPackage {
buildPythonPackage rec {
pname = "azure-mgmt-commerce";
version = "1.0.1";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-sdk-for-python";
rev = "ee5b47525d6c1eae3b1fd5f65b0421eab62a6e6f";
sha256 = "0xzdn7da5c3q5knh033vbsqk36vwbm75cx8vf10x0yj58krb4kn4";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1hw4crkgb72ps85m2kz9kf8p2wg9qmaagk3z5nydva9g6bnq93n4";
};
preBuild = ''
cd ./azure-mgmt-commerce
'';
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-nspkg
];
prePatch = ''
rm -f azure_bdist_wheel.py tox.ini
substituteInPlace setup.py \
--replace "wheel==0.30.0" "wheel"
sed -i "/azure-namespace-package/c\ " setup.cfg
'';
pythonNamespaces = [ "azure.mgmt" ];
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.commerce" ];
meta = with lib; {
description = "This is the Microsoft Azure Commerce Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [ mwilsoninsight ];
maintainers = with maintainers; [ mwilsoninsight jonringer ];
};
}

View File

@@ -1,32 +1,29 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, azure-common
, requests
}:
buildPythonPackage {
buildPythonPackage rec {
version = "0.20.7";
pname = "azure-servicemanagement-legacy";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-sdk-for-python";
rev = "ab01fc1f23462f130c69f46505524b88101023dc";
sha256 = "0w2bm9hkwy1m94l8r2klnpqn4192y8bir3z8bymxgfx9y0b1mn2q";
src = fetchPypi {
inherit version pname;
extension = "zip";
sha256 = "1kcibw17qm8c02y28xabm3k1zrawi6g4q8kzc751l5l3vagqnf2x";
};
preBuild = ''
cd ./azure-servicemanagement-legacy
'';
propagatedBuildInputs = [
azure-common
requests
];
pythonNamespaces = [ "azure" ];
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.servicemanagement" ];
meta = with lib; {
description = "This is the Microsoft Azure Service Management Legacy Client Library";

View File

@@ -25,7 +25,8 @@ buildPythonPackage rec {
checkInputs = [ pytest ];
checkPhase = ''
pytest tests
# New sklearn broke one test: https://github.com/fmfn/BayesianOptimization/issues/243
pytest tests -k "not test_suggest_with_one_observation"
'';
meta = with lib; {

View File

@@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "cirq";
version = "0.8.2";
version = "0.9.1";
disabled = pythonOlder "3.6";
@@ -36,25 +36,20 @@ buildPythonPackage rec {
owner = "quantumlib";
repo = "cirq";
rev = "v${version}";
sha256 = "0xs46s19idh8smf80zhgraxwh3lphcdbljdrhxwhi5xcc41dfsmf";
sha256 = "0mygvpq7kzga8l1w2jvwv9a2n3akpss45hrx250gdrnqjp6xrw64";
};
patches = [
(fetchpatch {
# Fixes serialization issues on certain versions of protobuf & numpy.
name = "cirq-pr-2986-protobuf-bools.patch";
url = "https://github.com/quantumlib/Cirq/commit/78ddfb574c0f3936f713613bf4ba102163efb7b3.patch";
sha256 = "0hmad9ndsqf5ci7shvd924d2rv4k9pzx2r2cl1bm5w91arzz9m18";
})
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "freezegun~=0.3.15" "freezegun" \
--replace "matplotlib~=3.0" "matplotlib" \
--replace "networkx~=2.4" "networkx" \
--replace "numpy~=1.16, < 1.19" "numpy" \
--replace "numpy~=1.16" "numpy" \
--replace "protobuf~=3.12.0" "protobuf"
# Fix serialize_sympy_constants test by allowing small errors in pi
substituteInPlace cirq/google/arg_func_langs_test.py \
--replace "'float_value': float(str(np.float32(sympy.pi)))" "'float_value': pytest.approx(float(str(np.float32(sympy.pi))))"
'';
propagatedBuildInputs = [
@@ -87,6 +82,7 @@ buildPythonPackage rec {
pytestFlagsArray = [
"--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope
"--ignore=cirq/contrib/" # requires external (unpackaged) python packages, so untested.
"--benchmark-disable" # Don't need to run benchmarks when packaging.
];
disabledTests = [
@@ -95,6 +91,25 @@ buildPythonPackage rec {
# Seem to fail due to math issues on aarch64?
"expectation_from_wavefunction"
"test_single_qubit_op_to_framed_phase_form_output_on_example_case"
] ++ [
# slow tests, for quicker building
"test_anneal_search_method_calls"
"test_density_matrix_from_state_tomography_is_correct"
"test_example_runs_qubit_characterizations"
"test_example_runs_hello_line_perf"
"test_example_runs_bc_mean_field_perf"
"test_main_loop"
"test_clifford_circuit_2"
"test_decompose_specific_matrices"
"test_two_qubit_randomized_benchmarking"
"test_kak_decomposition_perf"
"test_example_runs_simon"
"test_decompose_random_unitary"
"test_decompose_size_special_unitary"
"test_api_retry_5xx_errors"
"test_xeb_fidelity"
"test_example_runs_phase_estimator_perf"
"test_cross_entropy_benchmarking"
];
meta = with lib; {

View File

@@ -17,13 +17,13 @@
buildPythonPackage rec {
pname = "cvxpy";
version = "1.1.5";
version = "1.1.6";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "7c826a874db2e4cefe54e63ebd3a3763d0d72e55a17c7d1cfec80008a87b8d81";
sha256 = "36527573c937cedd270f46c77b50bb5e16b96ca7b05a7a480bdc8c9052595723";
};
propagatedBuildInputs = [

View File

@@ -3,7 +3,6 @@
, buildPythonPackage
, fetchPypi
, six
, nose
, appdirs
, scandir
, backports_os
@@ -15,7 +14,8 @@
, mock
, pythonAtLeast
, isPy3k
, pytest
, pytestCheckHook
, stdenv
}:
buildPythonPackage rec {
@@ -28,7 +28,7 @@ buildPythonPackage rec {
};
buildInputs = [ glibcLocales ];
checkInputs = [ nose pyftpdlib mock psutil pytest ];
checkInputs = [ pyftpdlib mock psutil pytestCheckHook ];
propagatedBuildInputs = [ six appdirs pytz ]
++ lib.optionals (!isPy3k) [ backports_os ]
++ lib.optionals (!pythonAtLeast "3.6") [ typing ]
@@ -37,10 +37,20 @@ buildPythonPackage rec {
LC_ALL="en_US.utf-8";
checkPhase = ''
HOME=$(mktemp -d) pytest -k 'not user_data_repr' --ignore=tests/test_opener.py
preCheck = ''
HOME=$(mktemp -d)
'';
pytestFlagsArray = [ "--ignore=tests/test_opener.py" ];
disabledTests = [
"user_data_repr"
] ++ lib.optionals (stdenv.isDarwin) [ # remove if https://github.com/PyFilesystem/pyfilesystem2/issues/430#issue-707878112 resolved
"test_ftpfs"
];
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "Filesystem abstraction";
homepage = "https://github.com/PyFilesystem/pyfilesystem2";

View File

@@ -24,12 +24,15 @@ buildPythonPackage rec {
numpy
];
pytestFlagsArray = [ "--rootdir=$(mktemp -d)" ];
disabledTests = [
# Test assumes user name is part of $HOME
# AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar'
"test_strip_protocol_expanduser"
# flaky: works locally but fails on hydra
# as it uses the install dir for tests instead of a temp dir
# resolved in https://github.com/intake/filesystem_spec/issues/432 and
# can be enabled again from version 0.8.4
"test_pathobject"
] ++ lib.optionals (stdenv.isDarwin) [
# works locally on APFS, fails on hydra with AssertionError comparing timestamps
# darwin hydra builder uses HFS+ and has only one second timestamp resolution

View File

@@ -14,8 +14,10 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "pyglet>=1.2.0,<=1.3.2" "pyglet"
--replace "pyglet>=1.2.0,<=1.3.2" "pyglet" \
--replace "cloudpickle>=1.2.0,<1.4.0" "cloudpickle~=1.2"
'';
# cloudpickle range has been expanded in package but not yet released
propagatedBuildInputs = [
numpy requests six pyglet scipy cloudpickle
@@ -24,6 +26,8 @@ buildPythonPackage rec {
# The test needs MuJoCo that is not free library.
doCheck = false;
pythonImportCheck = [ "gym" ];
meta = with lib; {
description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents";
homepage = "https://gym.openai.com/";

View File

@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "localzone";
version = "0.9.6";
version = "0.9.7";
src = fetchFromGitHub {
owner = "ags-slc";
repo = pname;
rev = "v${version}";
sha256 = "154l7qglsm4jrhqddvlas8cgl9qm2z4dzihv05jmsyqjikcmfwk8";
sha256 = "1vzn1vm3zf86l7qncbmghjrwyvla9dc2v8abn8jajbl47gm7r5f7";
};
propagatedBuildInputs = [ dnspython sphinx ];
@@ -30,6 +30,5 @@ buildPythonPackage rec {
homepage = "https://localzone.iomaestro.com";
license = licenses.bsd3;
maintainers = with maintainers; [ flyfloh ];
broken = true; # incompatible with dnspython>=2.0.0
};
}

View File

@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "nvchecker";
version = "2.0";
version = "2.1";
# Tests not included in PyPI tarball
src = fetchFromGitHub {
owner = "lilydjwg";
repo = pname;
rev = "v${version}";
sha256 = "13wa95pvivbyshq3ys12iyvn8wlyzxfia8l6xh3fd46a2cs9x9g7";
sha256 = "0zf9vhf8ka0v1mf1xhbvkc2nr54m0rkiw1i68ps4sgx2mdj6qrfk";
};
propagatedBuildInputs = [ setuptools toml structlog appdirs tornado pycurl aiohttp ];

View File

@@ -1,21 +1,21 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests
, tqdm, websocket_client, pytest, pillow, mock, isPy27 }:
, tqdm, websocket_client, pytest, pillow, isPy27 }:
buildPythonPackage rec {
pname = "PlexAPI";
version = "3.6.0";
version = "4.1.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "1lzp3367hmcpqwbkp4ckdv6hv37knwnwya88jicwl1smznpmjdfv";
sha256 = "1l955q1q6lljq3bmyiayr33gzxrlw16xdwgjdaflznvyg16fcjkk";
};
propagatedBuildInputs = [ requests tqdm websocket_client ];
checkInputs = [ pytest pillow ]
++ lib.optionals isPy27 [ mock ];
checkInputs = [ pytest pillow ];
meta = with lib; {
homepage = "https://github.com/pkkid/python-plexapi";

View File

@@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "poetry";
version = "1.1.0";
version = "1.1.1";
format = "pyproject";
disabled = isPy27;
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "python-poetry";
repo = pname;
rev = version;
sha256 = "0kl23dkq9n112z1pqjg6f1wv3qk77ij6q5glg15lwrj7yrl9k65c";
sha256 = "1j3ij8qsd709p7ww5r4759f2xnk2s7g40kzm9vx99l98zw890g05";
};
postPatch = ''

View File

@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "py3exiv2";
version = "0.7.0";
version = "0.8.0";
disabled = !(isPy3k);
src = fetchPypi {
inherit pname version;
sha256 = "1gcvmglyl8ad2f336w88gwkd5djjsxdx1ind9wnlbqc3jn9i05cg";
sha256 = "1v419f1kkqw8hqyc3yhzslnbzk52j8j3wfknfkjg308n5mf5bn09";
};
buildInputs = [ exiv2 boost ];
@@ -15,20 +15,11 @@ buildPythonPackage rec {
# work around python distutils compiling C++ with $CC (see issue #26709)
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
# fix broken libboost_python3 detection
patches = [
(substituteAll {
src = ./setup.patch;
version = "3${stdenv.lib.versions.minor python.version}";
})
];
meta = {
homepage = "https://launchpad.net/py3exiv2";
description = "A Python3 binding to the library exiv2";
license = with stdenv.lib.licenses; [ gpl3 ];
maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
broken = true;
};
}

View File

@@ -1,11 +0,0 @@
--- a/setup.py 2017-10-16 22:03:02.000000000 +0200
+++ b/setup.py 2017-10-16 22:03:34.000000000 +0200
@@ -39,7 +39,7 @@
if '3' in l[2:]:
return l.replace('libboost', 'boost')
-libboost = get_libboost_name()
+libboost = 'boost_python@version@'
setup(
name='py3exiv2',

View File

@@ -1,36 +0,0 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, graphviz
, mock
, pyparsing
, pytest
, unittest2
}:
buildPythonPackage rec {
pname = "pydot_ng";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "8c8073b97aa7030c28118961e2c6c92f046e4cb57aeba7df87146f7baa6530c5";
};
propagatedBuildInputs = [ graphviz pyparsing ];
checkInputs = [
graphviz
mock
pytest
] ++ lib.optionals isPy27 [ unittest2];
checkPhase = ''
pytest
'';
meta = with lib; {
homepage = "https://pypi.python.org/pypi/pydot-ng";
description = "Python 3-compatible update of pydot, a Python interface to Graphviz's Dot";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin jonringer ];
};
}

View File

@@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, cython
, openems
, csxcad
, numpy
, matplotlib
}:
buildPythonPackage rec {
pname = "python-csxcad";
version = "unstable-2020-02-18";
src = fetchFromGitHub {
owner = "thliebig";
repo = "CSXCAD";
rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518";
sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb";
};
sourceRoot = "source/python";
nativeBuildInputs = [
cython
];
propagatedBuildInputs = [
openems
csxcad
numpy
matplotlib
];
setupPyBuildFlags = "-I${openems}/include -L${openems}/lib -R${openems}/lib";
meta = with lib; {
description = "Python interface to CSXCAD";
homepage = http://openems.de/index.php/Main_Page.html;
license = licenses.gpl3;
maintainers = with maintainers; [ matthuszagh ];
platforms = platforms.linux;
};
}

View File

@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, nose, libarchive, glibcLocales
{ stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, nose, libarchive, glibcLocales, isPy27
# unrar is non-free software
, useUnrar ? false, unrar
}:
@@ -6,17 +6,19 @@
assert useUnrar -> unrar != null;
assert !useUnrar -> libarchive != null;
buildPythonPackage {
buildPythonPackage rec {
pname = "rarfile";
version = "3.0";
version = "4.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "markokr";
repo = "rarfile";
rev = "rarfile_3_0";
sha256 = "07yliz6p1bxzhipnrgz133gl8laic35gl4rqfay7f1vc384ch7sn";
rev = "v${version}";
sha256 = "0gpriqkvcb6bsccvq8b099xjv5fkjs0d7g4636d5jphy417jxk5m";
};
buildInputs = [ pytest nose glibcLocales ];
checkInputs = [ pytestCheckHook nose glibcLocales ];
prePatch = ''
substituteInPlace rarfile.py \
@@ -31,9 +33,7 @@ buildPythonPackage {
# the tests only work with the standard unrar package
doCheck = useUnrar;
LC_ALL = "en_US.UTF-8";
checkPhase = ''
py.test test -k "not test_printdir"
'';
pythonImportsCheck = [ "rarfile" ];
meta = with stdenv.lib; {
description = "RAR archive reader for Python";