Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2020-09-03 19:21:10 +02:00
278 changed files with 3663 additions and 2242 deletions

View File

@@ -0,0 +1,31 @@
{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart
, pytest, starlette, httpx, pytest-asyncio }:
buildPythonPackage rec {
version = "0.7";
pname = "asgi-csrf";
disabled = isPy27;
# PyPI tarball doesn't include tests directory
src = fetchFromGitHub {
owner = "simonw";
repo = pname;
rev = version;
sha256 = "1vf4lh007790836cp3hd6wf8wsgj045dcg0w1cm335p08zz6j4k7";
};
propagatedBuildInputs = [ itsdangerous python-multipart ];
checkInputs = [ pytest starlette httpx pytest-asyncio ];
checkPhase = ''
pytest test_asgi_csrf.py
'';
pythonImportsCheck = [ "asgi_csrf" ];
meta = with stdenv.lib; {
description = "ASGI middleware for protecting against CSRF attacks";
license = licenses.asl20;
homepage = "https://github.com/simonw/asgi-csrf";
maintainers = [ maintainers.ris ];
};
}

View File

@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, pytestCheckHook
, importlib-metadata
, pytestCheckHook
}:
@@ -24,7 +25,8 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Tiny library for adding function or object registries";
homepage = "https://github.com/explosion/catalogue";
changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ danieldk ];
};
};
}

View File

@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "certbot";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1y0m5qm853i6pcpb2mrf8kjkr9wr80mdrx1qmck38ayvr2v2p5lc";
sha256 = "1fx29gsa3glwh0ik5k2gynwdz6i3ckq9aakf6ip92n3qyh6l08a8";
};
sourceRoot = "source/${pname}";

View File

@@ -50,7 +50,11 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "protobuf~=3.12.0" "protobuf~=3.12"
--replace "freezegun~=0.3.15" "freezegun" \
--replace "matplotlib~=3.0" "matplotlib" \
--replace "networkx~=2.4" "networkx" \
--replace "numpy~=1.16, < 1.19" "numpy" \
--replace "protobuf~=3.12.0" "protobuf"
'';
propagatedBuildInputs = [
@@ -69,7 +73,7 @@ buildPythonPackage rec {
];
doCheck = true;
# pythonImportsCheck = [ "cirq" "cirq.Ciruit" ]; # cirq's importlib hook doesn't work here
# pythonImportsCheck = [ "cirq" "cirq.Circuit" ]; # cirq's importlib hook doesn't work here
dontUseSetuptoolsCheck = true;
checkInputs = [
pytestCheckHook
@@ -83,16 +87,10 @@ buildPythonPackage rec {
pytestFlagsArray = [
"--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope
"--benchmark-disable" # Don't need to run benchmarks when packaging.
];
disabledTests = [
"test_serialize_sympy_constants" # fails due to small error in pi (~10e-7)
"test_convert_to_ion_gates" # fails due to rounding error, 0.75 != 0.750...2
# Newly disabled tests on cirq 0.8
# TODO: test & figure out why failing
"engine_job_test"
"test_health"
"test_run_delegation"
"test_convert_to_ion_gates" # fails on some systems due to rounding error, 0.75 != 0.750...2
] ++ lib.optionals stdenv.isAarch64 [
# Seem to fail due to math issues on aarch64?
"expectation_from_wavefunction"
@@ -102,6 +100,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.";
homepage = "https://github.com/quantumlib/cirq";
changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ drewrisinger ];
};

View File

@@ -0,0 +1,32 @@
{ lib, jdk, buildPythonPackage, fetchPypi, six, py4j }:
buildPythonPackage rec {
pname = "databricks-connect";
version = "7.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "996a9d0f271f6c7edbd2d85b2efb6ff4e58d15222e80f87ca17fdbf224e17056";
};
sourceRoot = ".";
propagatedBuildInputs = [ py4j six jdk ];
# requires network access
doCheck = false;
preFixup = ''
substituteInPlace "$out/bin/find-spark-home" \
--replace find_spark_home.py .find_spark_home.py-wrapped
'';
pythonImportsCheck = [ "pyspark" "six" "py4j" ];
meta = with lib; {
description = "Client for connecting to remote Databricks clusters";
homepage = "https://pypi.org/project/databricks-connect";
license = licenses.databricks;
maintainers = with maintainers; [ kfollesdal ];
};
}

View File

@@ -2,19 +2,22 @@
, buildPythonPackage
, fetchFromGitHub
, aiofiles
, asgi-csrf
, click
, click-default-group
, janus
, jinja2
, hupper
, mergedeep
, pint
, pluggy
, python-baseconv
, pyyaml
, uvicorn
# Check Inputs
, pytestCheckHook
, pytestrunner
, pytest-asyncio
, black
, aiohttp
, beautifulsoup4
, asgiref
@@ -23,26 +26,30 @@
buildPythonPackage rec {
pname = "datasette";
version = "0.39";
version = "0.46";
src = fetchFromGitHub {
owner = "simonw";
repo = "datasette";
rev = version;
sha256 = "07d46512bc9sdan9lv39sf1bwlf7vf1bfhcsm825vk7sv7g9kczd";
sha256 = "0g4dfq5ykifa9628cb4i7gvx98p8hvb99gzfxk3bkvq1v9p4kcqq";
};
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [
aiofiles
asgi-csrf
click
click-default-group
janus
jinja2
hupper
mergedeep
pint
pluggy
python-baseconv
pyyaml
uvicorn
setuptools
];
@@ -52,7 +59,6 @@ buildPythonPackage rec {
pytest-asyncio
aiohttp
beautifulsoup4
black
asgiref
];
@@ -60,22 +66,17 @@ buildPythonPackage rec {
substituteInPlace setup.py \
--replace "click~=7.1.1" "click" \
--replace "click-default-group~=1.2.2" "click-default-group" \
--replace "Jinja2~=2.10.3" "Jinja2" \
--replace "hupper~=1.9" "hupper" \
--replace "pint~=0.9" "pint" \
--replace "pluggy~=0.13.0" "pint" \
--replace "pluggy~=0.13.0" "pluggy" \
--replace "uvicorn~=0.11" "uvicorn" \
--replace "aiofiles~=0.4.0" "aiofiles" \
--replace "janus~=0.4.0" "janus" \
--replace "PyYAML~=5.3" "PyYAML"
'';
# many tests require network access
# test_html is very slow
# test_black fails on darwin
dontUseSetuptoolsCheck = true;
pytestFlagsArray = [
"--ignore=tests/test_api.py"
"--ignore=tests/test_csv.py"
"--ignore=tests/test_html.py"
"--ignore=tests/test_docs.py"
"--ignore=tests/test_black.py"
@@ -84,6 +85,7 @@ buildPythonPackage rec {
"facet"
"_invalid_database" # checks error message when connecting to invalid database
];
pythonImportsCheck = [ "datasette" ];
meta = with lib; {
description = "An instant JSON API for your SQLite databases";

View File

@@ -1,4 +1,6 @@
{ buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }:
{ buildPythonPackage, stdenv, lib, dlib, python, pytest, more-itertools
, avxSupport ? stdenv.hostPlatform.avxSupport
}:
buildPythonPackage {
inherit (dlib) name src nativeBuildInputs buildInputs meta;

View File

@@ -7,11 +7,11 @@
buildPythonPackage (rec {
pname = "elasticsearch";
version = "7.8.1";
version = "7.9.1";
src = fetchPypi {
inherit pname version;
sha256 = "92b534931865a186906873f75ae0b91808ff5036b0f2b9269eb5f6dc09644b55";
sha256 = "5e08776fbb30c6e92408c7fa8c37d939210d291475ae2f364f0497975918b6fe";
};
# Check is disabled because running them destroy the content of the local cluster!

View File

@@ -2,11 +2,11 @@
, buildPythonPackage
, fetchPypi
, six
, requests-cache
, pygments
, pyquery
, cachelib
, appdirs
, keep
}:
buildPythonPackage rec {
@@ -18,11 +18,21 @@ buildPythonPackage rec {
sha256 = "8e4d048ae7ca6182d648f62a66d07360cca2504fe46649c32748b6ef2735f7f4";
};
propagatedBuildInputs = [ six requests-cache pygments pyquery cachelib appdirs ];
postPatch = ''
substituteInPlace setup.py --replace 'cachelib==0.1' 'cachelib'
'';
propagatedBuildInputs = [ six pygments pyquery cachelib appdirs keep ];
# author hasn't included page_cache directory (which allows tests to run without
# external requests) in pypi tarball. github repo doesn't have release revisions
# clearly tagged. re-enable tests when either is sorted.
doCheck = false;
preCheck = ''
mv howdoi _howdoi
export HOME=$(mktemp -d)
'';
pythonImportsCheck = [ "howdoi" ];
meta = with lib; {
description = "Instant coding answers via the command line";

View File

@@ -0,0 +1,34 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, isPy27
, h11
, sniffio
}:
buildPythonPackage rec {
pname = "httpcore";
version = "0.10.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
sha256 = "00gn8nfv814rg6fj7xv97mrra3fvx6fzjcgx9y051ihm6hxljdsi";
};
propagatedBuildInputs = [ h11 sniffio ];
# tests require pythonic access to mitmproxy, which isn't (yet?) packaged as
# a pythonPackage.
doCheck = false;
pythonImportsCheck = [ "httpcore" ];
meta = with stdenv.lib; {
description = "A minimal HTTP client";
homepage = "https://github.com/encode/httpcore";
license = licenses.bsd3;
maintainers = [ maintainers.ris ];
};
}

View File

@@ -2,64 +2,60 @@
, buildPythonPackage
, fetchFromGitHub
, certifi
, hstspreload
, chardet
, h11
, h2
, httpcore
, idna
, rfc3986
, sniffio
, isPy27
, pytest
, pytest-asyncio
, pytest-trio
, pytestcov
, trustme
, uvicorn
, trio
, brotli
, urllib3
}:
buildPythonPackage rec {
pname = "httpx";
version = "0.12.1";
version = "0.14.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
sha256 = "1nrp4h1ppb5vll81fzxmks82p0hxcil9f3mja3dgya511kc703h6";
sha256 = "08b6k5g8car3bic90aw4ysb2zvsa5nm8qk3hk4dgamllnnxzl5br";
};
propagatedBuildInputs = [
certifi
hstspreload
chardet
h11
h2
httpcore
idna
rfc3986
sniffio
urllib3
];
checkInputs = [
pytest
pytest-asyncio
pytest-trio
pytestcov
trustme
uvicorn
trio
brotli
];
postPatch = ''
substituteInPlace setup.py \
--replace "h11==0.8.*" "h11"
'';
checkPhase = ''
PYTHONPATH=.:$PYTHONPATH pytest
PYTHONPATH=.:$PYTHONPATH pytest -k 'not (test_connect_timeout or test_elapsed_timer)'
'';
pythonImportsCheck = [ "httpx" ];
meta = with lib; {
description = "The next generation HTTP client";

View File

@@ -0,0 +1,36 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, PyGithub
, terminaltables
, click
, requests
}:
buildPythonPackage rec {
pname = "keep";
version = "2.9";
src = fetchPypi {
inherit pname version;
sha256 = "0902kcvhbmy5q5n0ai1df29ybf87qaljz306c5ssl8j9xdjipcq2";
};
propagatedBuildInputs = [
click
requests
terminaltables
PyGithub
];
# no tests
pythonImportsCheck = [ "keep" ];
meta = with stdenv.lib; {
homepage = "https://github.com/orkohunter/keep";
description = "A Meta CLI toolkit: Personal shell command keeper and snippets manager";
platforms = platforms.all;
license = licenses.mit;
maintainers = with maintainers; [ ris ];
};
}

View File

@@ -20,13 +20,13 @@
buildPythonPackage rec {
pname = "matrix-nio";
version = "0.14.1";
version = "0.15.1";
src = fetchFromGitHub {
owner = "poljar";
repo = "matrix-nio";
rev = version;
sha256 = "0mgb9m3298jvw3wa051zn7vp1m8qriys3ps0qn3sq54fndljgg5k";
sha256 = "127n4sqdcip1ld42w9wz49pxkpvi765qzvivvwl26720n11zq5cd";
};
nativeBuildInputs = [

View File

@@ -0,0 +1,26 @@
{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, pytest }:
buildPythonPackage rec {
pname = "mergedeep";
version = "1.3.0";
disabled = isPy27;
# PyPI tarball doesn't include tests directory
src = fetchFromGitHub {
owner = "clarketm";
repo = "mergedeep";
rev = "v${version}";
sha256 = "1a0y26a04limiggjwqyyqpryxiylbqya74nq1bij75zhz42sa02b";
};
checkInputs = [ pytest ];
checkPhase = "pytest";
pythonImportsCheck = [ "mergedeep" ];
meta = with stdenv.lib; {
homepage = "https://github.com/clarketm/mergedeep";
description = "A deep merge function for python";
license = licenses.mit;
maintainers = with maintainers; [ ris ];
};
}

View File

@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pdfminer_six";
version = "20200720";
version = "20200726";
disabled = !isPy3k;
@@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "pdfminer";
repo = "pdfminer.six";
rev = version;
sha256 = "19cnl1b6mrk9i18a1k4vdl5k85ww8yhfq89w3fxh6rb0fla5d71i";
sha256 = "1hlaz7ax1czb028x3nhk3l2jy07f26q5hbhmdirljaaga24vd96z";
};
propagatedBuildInputs = [ chardet cryptography sortedcontainers ];

View File

@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py }:
{ stdenv, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }:
buildPythonPackage rec {
pname = "phonopy";
@@ -9,15 +9,15 @@ buildPythonPackage rec {
sha256 = "482c6ff29c058d091ac885e561e28ba3e516ea9e91c44a951cad11f3ae19856c";
};
propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ];
propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ];
checkPhase = ''
cd test
# dynamic structure factor test ocassionally fails do to roundoff
# see issue https://github.com/atztogo/phonopy/issues/79
rm spectrum/test_dynamic_structure_factor.py
${python.interpreter} -m unittest discover -b
cd ../..
checkInputs = [ pytestCheckHook ];
# flakey due to floating point inaccuracy
disabledTests = [ "test_NaCl" ];
# prevent pytest from importing local directory
preCheck = ''
rm -r phonopy
'';
meta = with stdenv.lib; {

View File

@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "pre-commit";
version = "2.6.0";
version = "2.7.1";
disabled = isPy27;
src = fetchPypi {
inherit version;
pname = "pre_commit";
sha256 = "05d9635v0yzrj2848m2hn9axbvds0dymv49rlyj238v3vlzncmqn";
sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5";
};
patches = [

View File

@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "solo-python";
version = "0.0.23";
version = "0.0.26";
format = "flit";
disabled = pythonOlder "3.6"; # only python>=3.6 is supported
@@ -11,7 +11,7 @@
owner = "solokeys";
repo = pname;
rev = version;
sha256 = "0r9cq0sd8pqnavgwa5cqgdxzbgly2baq8fpclnnz6anb2974kg3f";
sha256 = "05rwqrhr1as6zqhg63d6wga7l42jm2azbav5w6ih8mx5zbxf61yz";
};
# replaced pinned fido, with unrestricted fido version

View File

@@ -21,19 +21,14 @@
buildPythonPackage rec {
pname = "starlette";
# This is not the latest version of Starlette, however, later
# versions of Starlette break FastAPI due to
# https://github.com/tiangolo/fastapi/issues/683. Please update when
# possible. FastAPI is currently Starlette's only dependent.
version = "0.13.6";
version = "0.13.8";
disabled = isPy27;
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
sha256 = "08d1d4qdwhi1xxag4am5ijingdyn0mbyqajs9ql5shxnybyjv321";
sha256 = "11i0yd8cqwscixajl734g11vf8pghki11c81chzfh8ifmj6mf9jk";
};
propagatedBuildInputs = [
@@ -57,6 +52,7 @@ buildPythonPackage rec {
checkPhase = ''
pytest --ignore=tests/test_graphql.py
'';
pythonImportsCheck = [ "starlette" ];
meta = with lib; {
homepage = "https://www.starlette.io/";

View File

@@ -23,9 +23,9 @@
, xlaSupport ? cudaSupport
# Default from ./configure script
, cudaCapabilities ? [ "3.5" "5.2" ]
, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"]
, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"]
, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"]
, sse42Support ? stdenv.hostPlatform.sse4_2Support
, avx2Support ? stdenv.hostPlatform.avx2Support
, fmaSupport ? stdenv.hostPlatform.fmaSupport
# Darwin deps
, Foundation, Security
}:

View File

@@ -23,9 +23,9 @@
, xlaSupport ? cudaSupport
# Default from ./configure script
, cudaCapabilities ? [ "3.5" "5.2" ]
, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"]
, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"]
, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"]
, sse42Support ? stdenv.hostPlatform.sse4_2Support
, avx2Support ? stdenv.hostPlatform.avx2Support
, fmaSupport ? stdenv.hostPlatform.fmaSupport
# Darwin deps
, Foundation, Security
}:

View File

@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "transformers";
version = "3.0.2";
version = "3.1.0";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
sha256 = "0rdlikh2qilwd0s9f3zif51p1q7sp3amxaccqic8p5qm6dqpfpz6";
sha256 = "0wg36qrcljmpsyhjaxpqw3s1r6276yg8cq0bjrf52l4zlc5k4xzk";
};
propagatedBuildInputs = [
@@ -44,16 +44,23 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "tokenizers == 0.8.1.rc1" "tokenizers>=0.8"
--replace "tokenizers == 0.8.1.rc2" "tokenizers>=0.8"
'';
preCheck = ''
export HOME="$TMPDIR"
cd tests
# This test requires the nlp module, which we haven't
# packaged yet. However, nlp is optional for transformers
# itself
rm test_trainer.py
'';
# Disable tests that require network access.
disabledTests = [
"PegasusTokenizationTest"
"T5TokenizationTest"
"test_all_tokenizers"
"test_batch_encoding_is_fast"
"test_batch_encoding_pickle"
@@ -63,6 +70,7 @@ buildPythonPackage rec {
"test_hf_api"
"test_outputs_can_be_shorter"
"test_outputs_not_longer_than_maxlen"
"test_padding_accepts_tensors"
"test_pretokenized_tokenizers"
"test_tokenizer_equivalence_en_de"
"test_tokenizer_from_model_type"
@@ -74,6 +82,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
homepage = "https://github.com/huggingface/transformers";
description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch";
changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ danieldk pashashocky ];

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "ufonormalizer";
version = "0.4.1";
version = "0.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "0nv80x7l7sya5wzyfk9ss93r6bjzjljpkw4k8gibxp1rqrzkdms4";
sha256 = "1rn64a0i151qk6h5f9pijcmja195i2d6f8jbi5h4xkgkinm9wwzj";
extension = "zip";
};

View File

@@ -15,7 +15,7 @@ buildPythonPackage rec {
checkPhase = "pytest tests";
meta = with lib; {
description = "";
description = "Backport and updates for the unicodedata module";
homepage = "http://github.com/mikekap/unicodedata2";
license = licenses.asl20;
maintainers = [ maintainers.sternenseemann ];