mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-20 07:31:19 +00:00
Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
@@ -1,54 +0,0 @@
|
||||
diff -ruN astroquery-0.3.9.orig/astroquery/conftest.py astroquery-0.3.9/astroquery/conftest.py
|
||||
--- astroquery-0.3.9.orig/astroquery/conftest.py 2018-11-27 14:51:16.000000000 +0100
|
||||
+++ astroquery-0.3.9/astroquery/conftest.py 2019-07-23 18:19:17.000000000 +0200
|
||||
@@ -5,15 +5,20 @@
|
||||
# by importing them here in conftest.py they are discoverable by py.test
|
||||
# no matter how it is invoked within the source tree.
|
||||
|
||||
-from astropy.tests.pytest_plugins import (PYTEST_HEADER_MODULES,
|
||||
- enable_deprecations_as_exceptions,
|
||||
- TESTED_VERSIONS)
|
||||
+from astropy.version import version as astropy_version
|
||||
|
||||
-try:
|
||||
- packagename = os.path.basename(os.path.dirname(__file__))
|
||||
- TESTED_VERSIONS[packagename] = version.version
|
||||
-except NameError:
|
||||
- pass
|
||||
+if astropy_version < '3.0':
|
||||
+ # With older versions of Astropy, we actually need to import the pytest
|
||||
+ # plugins themselves in order to make them discoverable by pytest.
|
||||
+ from astropy.tests.pytest_plugins import *
|
||||
+else:
|
||||
+ # As of Astropy 3.0, the pytest plugins provided by Astropy are
|
||||
+ # automatically made available when Astropy is installed. This means it's
|
||||
+ # not necessary to import them here, but we still need to import global
|
||||
+ # variables that are used for configuration.
|
||||
+ from astropy.tests.plugins.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS
|
||||
+
|
||||
+from astropy.tests.helper import enable_deprecations_as_exceptions
|
||||
|
||||
# Add astropy to test header information and remove unused packages.
|
||||
# Pytest header customisation was introduced in astropy 1.0.
|
||||
@@ -36,12 +41,17 @@
|
||||
# The warnings_to_ignore_by_pyver parameter was added in astropy 2.0
|
||||
enable_deprecations_as_exceptions(modules_to_ignore_on_import=['requests'])
|
||||
|
||||
+# add '_testrun' to the version name so that the user-agent indicates that
|
||||
+# it's being run in a test
|
||||
+from . import version
|
||||
+version.version += '_testrun'
|
||||
+
|
||||
+
|
||||
# This is to figure out the affiliated package version, rather than
|
||||
# using Astropy's
|
||||
-try:
|
||||
- from .version import version
|
||||
-except ImportError:
|
||||
- version = 'dev'
|
||||
+from .version import version, astropy_helpers_version
|
||||
+
|
||||
|
||||
packagename = os.path.basename(os.path.dirname(__file__))
|
||||
TESTED_VERSIONS[packagename] = version
|
||||
+TESTED_VERSIONS['astropy_helpers'] = astropy_helpers_version
|
||||
@@ -20,10 +20,6 @@ buildPythonPackage rec {
|
||||
sha256 = "1ce57a8792c7d5d74206d797d379de6da35d56be433ea5840c41a49f202e2fab";
|
||||
};
|
||||
|
||||
# Fix tests using conftest.py from HEAD in the upstream GitHub
|
||||
# repository.
|
||||
patches = [ ./conftest-astropy-3-fix.patch ];
|
||||
|
||||
propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ];
|
||||
|
||||
nativeBuildInputs = [ astropy-helpers ];
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncpg";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0sp3m6sgw83rhvg87y78lhk4xxx58ffzyf9rsq5f1a7b8azbnlxj";
|
||||
sha256 = "0yjszgg1zbbsfxj1gv17ymc2hcfvymkvg69dvpvwy0dqspjxq0ma";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-cosmosdb";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "0iakxb2rr1w9171802m9syjzqas02vjah711mpagbgcj549mjysb";
|
||||
sha256 = "0y28z30g7y2pj7rfxyxmqpr19z24d01g9qhafvjxry748im1961h";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "7.0.0";
|
||||
version = "8.0.0";
|
||||
pname = "azure-mgmt-network";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "32ce90691b96ecdaa974ecb4d35063377c8fd21fd05984164507b63113f3456b";
|
||||
sha256 = "1prg4b1agda9bsn6zmvffkj22rr6jy784rdfp6154yifjr6z5jiv";
|
||||
};
|
||||
|
||||
postInstall = if isPy3k then "" else ''
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-reservations";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "06l362xiqhk8vvb1pch6ngfyv8m00ahr6ysdznd6qvxz8awazy10";
|
||||
sha256 = "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "5.1.0";
|
||||
version = "6.0.0";
|
||||
pname = "azure-mgmt-resource";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "88db03ea5b9db1dfbf3de8c7be111ed41b121a374645e3ddf3fbba47584c32b1";
|
||||
sha256 = "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0";
|
||||
};
|
||||
|
||||
postInstall = if isPy3k then "" else ''
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-sql";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "109w1kj45fvwc94bkhdkj3bdysrskfz8i6ph4qlpjk340zy81vvl";
|
||||
sha256 = "0qv58xraznv2ldhd34cvznhz045x3ncfgam9c12gxyj4q0k3pyc9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-web";
|
||||
version = "0.43.1";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "e3ab5acc9f13746e1f4ce19ccbacc4522527dd1f75eff2826cd882b7ba54806a";
|
||||
sha256 = "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "biopython";
|
||||
version = "1.74";
|
||||
version = "1.75";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1h4hcpx1vqrcddpcznyxy14zzvy2yanlkz0117w5n869w8djq595";
|
||||
sha256 = "01lrm353si63anhhynf6hqbd3f753c2k8dkk953j3g6257py8q2h";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, isPyPy
|
||||
}:
|
||||
@@ -14,6 +15,15 @@ buildPythonPackage rec {
|
||||
sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is";
|
||||
};
|
||||
|
||||
|
||||
patches = [
|
||||
# Fix compatibility for Python 3.7 https://github.com/DanielStutzbach/blist/pull/78
|
||||
(fetchpatch {
|
||||
url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch";
|
||||
sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://stutzbachenterprises.com/blist/;
|
||||
description = "A list-like type with better asymptotic performance and similar performance on small lists";
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boltons";
|
||||
version = "19.1.0";
|
||||
version = "19.3.0";
|
||||
|
||||
# No tests in PyPi Tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "mahmoud";
|
||||
repo = "boltons";
|
||||
rev = version;
|
||||
sha256 = "0b55wly0ksviyl3a4dmih9vzd7bj3p10gr6la4722cs9cx4128q5";
|
||||
sha256 = "0pgqr2hf7lxag8nc8wnh8hpp8fd2lxccq9h0bb8lb9x8npnzhnbn";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "click-default-group";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
# No tests in Pypi tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "click-contrib";
|
||||
repo = "click-default-group";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wdmabfpmzxpiww0slinvxm9xjyxql250dn1pvjijq675pxafiz4";
|
||||
sha256 = "0nk39lmkn208w8kvq6f4h3a6qzxrrvxixahpips6ik3zflbkss86";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ];
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "diff_cover";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
preCheck = ''
|
||||
export LC_ALL=en_US.UTF-8;
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a78babbec1c3088a6c3a5b62cddccaeac4717236ea4f5d28b6af00f2d9b2e341";
|
||||
sha256 = "12h91rvbrf9qmdmj5nfqhcd3bpwq1pvk990bag4hyxcf86qlzds4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "distlib";
|
||||
version = "0.2.9.post0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ecb3d0e4f71d0fa7f38db6bcc276c7c9a1c6638a516d726495934a553eb3fbe0";
|
||||
sha256 = "08fyi2r246733vharl2yckw20rilci28r91mzrnnvcr638inw5if";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-dynamic-preferences";
|
||||
version = "1.7.1";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1z2dndkpypk4pvb0byh5a771vgp50vn8g1rbk5r3sml6dm4wcn7s";
|
||||
sha256 = "1v7mf48gb2qmmks3ifnhkh0vfd7hpvx5v81ypc9cqy35n3ir0q4a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six django persisting-theory ];
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-storages";
|
||||
version = "1.7.2";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "01xq232h321716r08rari9payas7fsiwwr5q6zgcrlwkckwxxczk";
|
||||
sha256 = "000abaayhymh4rxmk19hwhlyibc62rs0qdfczkhf4wb3p9san8lk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
, xarray
|
||||
, networkx
|
||||
, streamz
|
||||
, colorcet
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -26,6 +27,7 @@ buildPythonPackage rec {
|
||||
checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ];
|
||||
propagatedBuildInputs = [
|
||||
bokeh
|
||||
colorcet
|
||||
holoviews
|
||||
pandas
|
||||
];
|
||||
|
||||
@@ -24,7 +24,8 @@ buildPythonPackage rec {
|
||||
# or very large dependencies (keras + tensorflow)
|
||||
py.test imblearn -k 'not estimator \
|
||||
and not classification \
|
||||
and not _generator'
|
||||
and not _generator \
|
||||
and not show_versions'
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "inotify-simple";
|
||||
version = "1.1.8";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "inotify_simple";
|
||||
inherit version;
|
||||
sha256 = "1pfqvnynwh318cakldhg7535kbs02asjsgv6s0ki12i7fgfi0b7w";
|
||||
sha256 = "132craajflksgxxwjawj73nn1ssv8jn58j3k5vvyiq03avbz4sfv";
|
||||
};
|
||||
|
||||
# The package has no tests
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jenkins-job-builder";
|
||||
version = "3.0.2";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "02ggscsyrrqk06w9lb43km77qgcj8cixrrm5mkigr4gz2pzdjhmf";
|
||||
sha256 = "1wcmn01md6hykblk5zz8wd5zizyisspspakz446jg2kqfv4y3q03";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kconfiglib";
|
||||
version = "13.1.1";
|
||||
version = "13.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b44af5a6dc0c716926c926ba4c1f301ce286b3a3f292ae359a866eb01dc5260e";
|
||||
sha256 = "045yjmn6xqbyb68l1jqlgi3c8cwlw1krsrlfwrrgjijkmbx6yqmd";
|
||||
};
|
||||
|
||||
# doesnt work out of the box but might be possible
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
python.pkgs.buildPythonPackage rec {
|
||||
pname = "klaus";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonashaag";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "041l5dpymi9h0yyr55r6m0skp0m2ags3miay0s1bgfcp469k0l20";
|
||||
sha256 = "0pagyqfcj47ghd9m7b32hvi17hbl19f0wallkz6ncvmvvy919lfz";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lark-parser";
|
||||
version = "0.7.7";
|
||||
version = "0.7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lark-parser";
|
||||
repo = "lark";
|
||||
rev = version;
|
||||
sha256 = "1b0dvvqqasir8dfpqj4jch7wxxk43csbv0wa80fiqsdlymxxj2dj";
|
||||
sha256 = "0gd5c3scpyir3h8clhwb5jsf8dkmh1vh7rx8135lkx9fxx01q0az";
|
||||
};
|
||||
|
||||
# tests of Nearley support require js2py
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "license-expression";
|
||||
version = "1.0";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nexB";
|
||||
repo = "license-expression";
|
||||
rev = "v${version}";
|
||||
sha256 = "15dk3j5sr8iypzqqa8wa12b2a84f6ssbfvam1c1vzz00y2y5v3ic";
|
||||
sha256 = "0bbd7d90z58p9sd01b00g0vfd9bmwzksjb7pc8833s2jpja9mxz1";
|
||||
};
|
||||
postPatch = "patchShebangs ./configure";
|
||||
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mpv";
|
||||
version = "0.3.9";
|
||||
version = "0.3.10";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaseg";
|
||||
repo = "python-mpv";
|
||||
rev = "v${version}";
|
||||
sha256 = "112kr9wppcyy3shsb7v7kq0s1pdw6vw3v2fvqicm7qb2f49y2p4q";
|
||||
sha256 = "1w67rrxsvxl7glh5lri7c5hn1011jij1yh1dn50dxlz79n4h51b5";
|
||||
};
|
||||
|
||||
buildInputs = [ mpv ];
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbsphinx";
|
||||
version = "0.4.3";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09j47hmzgvf7rnz7n4n7295pp6qscq9hp50qva70vglzqck9yyjp";
|
||||
sha256 = "03g0mqbgk143cq3l3r42js2iy5l6iyvpckpqip4p468rlzrddyhn";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opentimestamps";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
disabled = (!isPy3k);
|
||||
|
||||
# We can't use the pypi source because it doesn't include README.md which is
|
||||
@@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
owner = "opentimestamps";
|
||||
repo = "python-opentimestamps";
|
||||
rev = "python-opentimestamps-v${version}";
|
||||
sha256 = "165rj08hwmbn44ra9n0cj5vfn6p49dqfn5lz2mks962mx19c7l0m";
|
||||
sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr";
|
||||
};
|
||||
|
||||
# Remove a failing test which expects the test source file to reside in the
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdf2image";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
propagatedBuildInputs = [ pillow poppler_utils ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "186g36dcfv83iranyd8gqw2zinhpcvmq86zd7sbsn237gcqk43rn";
|
||||
sha256 = "0bpprn5wcz414pqpvwjpd5cc0838shkw2cfvrwfiilhr09bhxbhb";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six, first
|
||||
{ stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six
|
||||
, setuptools_scm, git, glibcLocales, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pip-tools";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5427ea4dcc175649723985fbcace9b2d8f46f9adbcc63bc2d7b247d9bcc74917";
|
||||
sha256 = "0x36mp3a3f3wandfc0g8d53gg2jkc14nhisbryzspcl9f05sbvq6";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
checkInputs = [ pytest git glibcLocales mock ];
|
||||
propagatedBuildInputs = [ pip click six first setuptools_scm ];
|
||||
propagatedBuildInputs = [ pip click six setuptools_scm ];
|
||||
|
||||
disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) [
|
||||
# Depend on network tests:
|
||||
@@ -32,12 +32,8 @@ buildPythonPackage rec {
|
||||
"test_stdin"
|
||||
"test_upgrade_packages_option"
|
||||
"test_url_package"
|
||||
# Expect specific version of "six":
|
||||
"test_editable_package"
|
||||
"test_input_file_without_extension"
|
||||
"test_locally_available_editable_package_is_not_archived_in_cache_dir"
|
||||
"test_no_candidates"
|
||||
"test_no_candidates_pre"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
@@ -50,6 +46,5 @@ buildPythonPackage rec {
|
||||
homepage = https://github.com/jazzband/pip-tools/;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Pony is a Python ORM with beautiful query syntax";
|
||||
homepage = "https://ponyorm.org/";
|
||||
maintainers = with maintainers; [ d-goldin ];
|
||||
maintainers = with maintainers; [ d-goldin xvapx ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pudb";
|
||||
version = "2019.1";
|
||||
version = "2019.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "19imrr17jnkd6fd2w1zzh63z0hcipg5b9v2x4svqm5c08p3cyc5c";
|
||||
sha256 = "1p2qizb35f9lfhklldzrn8g9mwiar3zmpc44463h5n1ln40ymw78";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pygments urwid ];
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyGithub";
|
||||
version = "1.44";
|
||||
version = "1.44.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyGithub";
|
||||
repo = "PyGithub";
|
||||
rev = "v${version}";
|
||||
sha256 = "067iyarllgdp40bzjxskzrixvmz350yj1qf8wvbddka504bcbh9r";
|
||||
sha256 = "16ngnnm7xj9bd97pvyddag17dx28c5wi0gjx4ws8c8nrmf5w3iqk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.3.21";
|
||||
version = "0.3.24";
|
||||
pname = "pyaxmlparser";
|
||||
|
||||
# the PyPI tarball doesn't ship tests.
|
||||
@@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||
owner = "appknox";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1bphd2vl9akk78yqvvxcz36wmr47hp3nh6xyrdc8w1avy1aby1ij";
|
||||
sha256 = "0fys26p7xhbnbdzp80zm6n3mragp38p08nyrsnilfgnlpi6rjpg0";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
@@ -5,9 +5,10 @@
|
||||
, python
|
||||
, pytest
|
||||
, cmake
|
||||
, numpy ? null
|
||||
, eigen ? null
|
||||
, scipy ? null
|
||||
, catch
|
||||
, numpy
|
||||
, eigen
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -21,22 +22,41 @@ buildPythonPackage rec {
|
||||
sha256 = "0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
checkInputs = [ pytest ]
|
||||
++ (lib.optional (numpy != null) numpy)
|
||||
++ (lib.optional (eigen != null) eigen)
|
||||
++ (lib.optional (scipy != null) scipy);
|
||||
checkPhase = ''
|
||||
cmake ${if eigen != null then "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" else ""}
|
||||
make -j $NIX_BUILD_CORES pytest
|
||||
|
||||
buildInputs = [ catch ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3"
|
||||
] ++ lib.optionals (!python.isPy2) [
|
||||
# Enable some tests only on Python 3. The "test_string_view" test
|
||||
# 'testTypeError: string_view16_chars(): incompatible function arguments'
|
||||
# fails on Python 2.
|
||||
"-DPYBIND11_CPP_STANDARD=-std=c++17"
|
||||
];
|
||||
|
||||
dontUseSetuptoolsBuild = true;
|
||||
dontUsePipInstall = true;
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
preFixup = ''
|
||||
pushd ..
|
||||
export PYBIND11_USE_CMAKE=1
|
||||
setuptoolsBuildPhase
|
||||
pipInstallPhase
|
||||
# Symlink the CMake-installed headers to the location expected by setuptools
|
||||
mkdir -p $out/include/${python.libPrefix}
|
||||
ln -sf $out/include/pybind11 $out/include/${python.libPrefix}/pybind11
|
||||
popd
|
||||
'';
|
||||
|
||||
# re-expose the headers to other packages
|
||||
postInstall = ''
|
||||
ln -s $out/include/python${python.pythonVersion}m/pybind11/ $out/include/pybind11
|
||||
'';
|
||||
installCheckTarget = "pytest";
|
||||
doInstallCheck = true;
|
||||
checkInputs = [
|
||||
pytest
|
||||
numpy
|
||||
scipy
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/pybind/pybind11;
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycollada";
|
||||
version = "0.6";
|
||||
version = "0.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fcd6f38fd981e350f9ec754d9671834017accd600e967d6d299a6cfdae5ba4f4";
|
||||
sha256 = "0b2vz9fp9asw57m3p9zjlz9gddanrhpxbdfimg98ik654kp2vj7r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy dateutil ];
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Pympler";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ki7bqp1h9l1xc2k1h4vjyzsgs20i8ingvcdhszyi72s28wyf4bs";
|
||||
sha256 = "08mrpnb6cv2nvfncvr8a9a8bpwhnasa924anapnjvnaw5jcd4k7p";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynamodb";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d05d5e2b0f663679ad11421c6fc2cf2f89a2a5843e6ebc372706bf5a78d93762";
|
||||
sha256 = "0njbh3h6696nq5palqa0b8s0fbsvhbawpzl923dnfsa9kgq5m294";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python-dateutil botocore ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysaml2";
|
||||
version = "4.8.0";
|
||||
version = "4.9.0";
|
||||
|
||||
# No tests in PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "IdentityPython";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1nnmk7apg169bawqi06jbx3p0x4sq12kszzl7k6j39273hqq5ii4";
|
||||
sha256 = "1ww1l34zn25vxifs8nr0bg7gkhbpy5g45mj0jj4d8hzimahb1brx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-rerunfailures";
|
||||
version = "7.0";
|
||||
version = "8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1zfm9v80bqfdapygy9wmi6j6y5c179ixpnh9ih27py4v6cqwzjgk";
|
||||
sha256 = "04p8rfvv7yi3gsdm1dw1mfhjwg6507rhgj7nbm5gfqw4kxmj7h8p";
|
||||
};
|
||||
|
||||
checkInputs = [ mock pytest ];
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-engineio";
|
||||
version = "3.9.3";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelgrinberg";
|
||||
repo = "python-engineio";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rwlj12d37dpw6y3bdn6rxv68xnd9ykj4fr3ly0fa143xci35d9y";
|
||||
sha256 = "1495r55177c38wq88pb28l50dfd4213iyxwq1k5rmsgp66vww09s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gitlab";
|
||||
version = "1.12.1";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "984e110c1f76fd939652c30ce3101267a7064e34417cbfc4687e6106d4db54ec";
|
||||
sha256 = "125zimbdprfx2j90dp19hyh60lzj11264bm494awc585pr6v9d3k";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests six ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-periphery";
|
||||
version = "1.1.2";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1bhzkzjvz6zb6rc5zmvgqfszrcyh64v1hay7m1m5dn083gaznyk9";
|
||||
sha256 = "1arsibmc19iyzr70lqfrkq0fk6gd6imm3zxa7zxv93b6lwl5bw1d";
|
||||
};
|
||||
|
||||
# Some tests require physical probing and additional physical setup
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.11";
|
||||
version = "1.12";
|
||||
pname = "python-stdnum";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d5f0af1bee9ddd9a20b398b46ce062dbd4d41fcc9646940f2667256a44df3854";
|
||||
sha256 = "19fb5asv0ngnbpiz1bqzq2jhgn845kv9hjcjajsgzgfp2k24f4sc";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rasterio";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
# Pypi doesn't ship the tests, so we fetch directly from GitHub
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapbox";
|
||||
repo = "rasterio";
|
||||
rev = version;
|
||||
sha256 = "0xa9jazsgsf7is4dbf2bbnfga8q8nmqy0qq4i7jj3riiccwlm6xw";
|
||||
sha256 = "1d0y16c5da252nj3pbdjwbzmd5kmh533s8jwlvg3aappa7h7qc1s";
|
||||
};
|
||||
|
||||
checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock;
|
||||
|
||||
@@ -1,15 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, configparser
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Send2Trash";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hsoft";
|
||||
@@ -19,10 +16,10 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkPhase = "HOME=. py.test";
|
||||
checkInputs = [ pytest ] ++ lib.optional (!isPy3k) configparser;
|
||||
checkPhase = "HOME=$TMPDIR pytest";
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Send file to trash natively under macOS, Windows and Linux";
|
||||
homepage = https://github.com/hsoft/send2trash;
|
||||
license = licenses.bsd3;
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
, six
|
||||
, pytest
|
||||
, isPy27
|
||||
, tifffile
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -31,14 +32,16 @@ buildPythonPackage rec {
|
||||
requests
|
||||
scikitimage
|
||||
six
|
||||
tifffile
|
||||
] ++ lib.optionals isPy27 [ pathlib enum34 ];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
# ignore tests which require setup
|
||||
checkPhase = ''
|
||||
pytest
|
||||
pytest --ignore tests/io_
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smart_open";
|
||||
version = "1.8.4";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1y845mfsswyvczknwh359xprgc3hk8r17qy1wdibpz6y6pq0g3kq";
|
||||
sha256 = "0xmnp8ywakwg3y21gqdvjw8a4v42vaxfq6njqizzllm4c9g2nk76";
|
||||
};
|
||||
|
||||
# nixpkgs version of moto is >=1.2.0, remove version pin to fix build
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, isPy3k, isPy35
|
||||
{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35
|
||||
, mock
|
||||
, pysqlite
|
||||
, fetchpatch
|
||||
@@ -25,7 +25,9 @@ buildPythonPackage rec {
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "];
|
||||
# disable mem-usage tests on mac, has trouble serializing pickle files
|
||||
disabledTests = lib.optionals isPy35 [ "exception_persistent_flush_py3k "]
|
||||
++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ];
|
||||
|
||||
patches = [
|
||||
# Two patches for sqlite 3.30 compatibility.
|
||||
|
||||
@@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true";
|
||||
|
||||
in buildPythonPackage rec {
|
||||
pname = "tasklib";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3964fb7e87f86dc5e2708addb67e69d0932534991991b6bae2e37a0c2059273f";
|
||||
sha256 = "19yra86g3wz2xgk22dnrjjh3gla969vb8jrps5rf0cdmsm9qqisv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
34
pkgs/development/python-modules/tesserocr/default.nix
Normal file
34
pkgs/development/python-modules/tesserocr/default.nix
Normal file
@@ -0,0 +1,34 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
lib,
|
||||
# build dependencies
|
||||
cython,
|
||||
leptonica,
|
||||
pkg-config,
|
||||
tesseract,
|
||||
# extra python packages
|
||||
pillow
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tesserocr";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0nj33mwvppacy6p5mqk9a4x26hx9ailshgad84ks60wyms6rgjiv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython pkg-config ];
|
||||
buildInputs = [ leptonica tesseract ];
|
||||
propagatedBuildInputs = [ pillow ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple, Pillow-friendly, wrapper around the tesseract-ocr API for Optical Character Recognition (OCR)";
|
||||
homepage = "https://github.com/sirfz/tesserocr";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mtrsk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "traits";
|
||||
version = "5.1.2";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0a17qmpw0z9h7ybh5yxrghvkcf2q90vgxzbnv1n4i0fxhi7mjy3s";
|
||||
sha256 = "1b71vp0l4523428aw098xw6rmkl8vlcy2aag40akijbyz1nnk541";
|
||||
};
|
||||
|
||||
# Use pytest because its easier to discover tests
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "6.32.0";
|
||||
version = "6.33.1";
|
||||
# tests not included in PyPi, so fetch from github instead
|
||||
src = fetchFromGitHub {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = version;
|
||||
sha256 = "0by2qjzxv13k4lvy4mas0hf468xf98qbc2arc8fcy6aj7h8jaam8";
|
||||
sha256 = "1k8hf4azgjzb4fifclzi8gj6v22368jk3y9f7f9qhq9ina7ilycj";
|
||||
};
|
||||
|
||||
buildInputs = [ nose mock ];
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xdis";
|
||||
version = "4.1.2";
|
||||
version = "4.1.3";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rocky";
|
||||
repo = "python-xdis";
|
||||
rev = version;
|
||||
sha256 = "0icqhafsnmcs6628cg3jjgq0d3x835nqmhljcz93yi457hfqd2lp";
|
||||
sha256 = "0ixx9svyi0kw3z2i51cv1cyg4l5z8hy432kxgsvz20mr9a8z5c91";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xml2rfc";
|
||||
version = "2.34.0";
|
||||
version = "2.35.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7b9543edacc2f4fa12cea8b64ae8144afb493d7b2a0135494642f29592b5d272";
|
||||
sha256 = "0jpg9rxxw28n66wzznlhzdgv7b7gd1crcffjhlw7lam93ils4ah5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yamllint";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "076hqf189ww95n9vcbkkn8an42nx79cy8pf2qnl251yjncsvnbfl";
|
||||
sha256 = "05fg2i27bq40z83avmz3h91i206dx5k6nyyvpa5vja54sqg14q02";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zodbpickle";
|
||||
version = "1.0.4";
|
||||
version = "2.0.0";
|
||||
disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0n4hng2zil1j8sbz0b83pxx8ndlh34h2mnmli3bqjmnrbry5zlr5";
|
||||
sha256 = "0fb7c7pnz86pcs6qqwlyw72vnijc04ns2h1zfrm0h7yl8q7r7ng0";
|
||||
};
|
||||
|
||||
# fails..
|
||||
|
||||
Reference in New Issue
Block a user