Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-10-23 09:38:37 +02:00
93 changed files with 761 additions and 804 deletions

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-authorization";
version = "0.52.0";
version = "0.60.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn";
sha256 = "19yn2ar2y8j4idzf8mxrxplxnawbk83sid3pzvzddif29aipbs1i";
};
propagatedBuildInputs = [

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
version = "0.7.0";
version = "0.8.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "7a50da8415e316bd3be0c90ff7e2bffee2afb959aefea23b5923f22dd7094a37";
sha256 = "0rv3443h4f9n88ky0fkfrp6jhf7ck9w3v96q040g3c2vkkywsnwa";
};
propagatedBuildInputs = [

View File

@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-devspaces";
version = "0.1.0";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "4710dd59fc219ebfa4272dbbad58bf62093b52ce22bfd32a5c0279d2149471b5";
sha256 = "0dvjsr9i87j1ggbj3dcmgifpk64xr5f5ziwf7z1fwkcx0szcid7k";
};
propagatedBuildInputs = [

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-hanaonazure";
version = "0.6.0";
version = "0.10.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1spsy6g5z4nb1y1gfz0p1ykybi76qbig8j22zvmws59329b3br5h";
sha256 = "01gnrhwi3nswjdxk9fjjwbyyx83agpdksrksk0c4d7bm9p2871g6";
};
propagatedBuildInputs = [

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-iothub";
version = "0.8.2";
version = "0.9.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq";
sha256 = "19gcvmcd0r9xi2i3m800h3ak0mkf9yj64d55z7nrk25v3ksx0wrl";
};
propagatedBuildInputs = [

View File

@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "5.0.0";
version = "6.0.0";
pname = "azure-mgmt-network";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "03ymxm3ryhgh4f1pw00fiyb3lxv2w6nkvn8xnj91h8xdd34flqzc";
sha256 = "07ak0qqa0fw79mrwpf4isfirrsv1simggi5hfrn856vngrszcx84";
};
postInstall = if isPy3k then "" else ''

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-reservations";
version = "0.3.2";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0nksxjh5kh09dr0zw667fg8mzik4ymvfq3dipwag6pynbqr9ls4l";
sha256 = "06l362xiqhk8vvb1pch6ngfyv8m00ahr6ysdznd6qvxz8awazy10";
};
propagatedBuildInputs = [

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-sql";
version = "0.13.0";
version = "0.14.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "184jma28nyn4c52mjj0g0p6rci6kajsdjqy8mbdaisphpjl4f77l";
sha256 = "109w1kj45fvwc94bkhdkj3bdysrskfz8i6ph4qlpjk340zy81vvl";
};
propagatedBuildInputs = [

View File

@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "4.1.0";
version = "4.2.0";
pname = "azure-mgmt-storage";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1src3ki3xd8x0m6vmxig6y4lg7w4mg0sz6vmnsxdk8mxaird03jj";
sha256 = "02a7f5vpaypr2lrayay4i9m7sf7d6galqwjz5wj549vq85jdq5ny";
};
postInstall = if isPy3k then "" else ''

View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-subscription";
version = "0.3.0";
version = "0.5.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "7a095fe46e598210b178e1059bba82eb02f3b8a7f44f3791442ff7d9ff323d2b";
sha256 = "1w91zqi2icld76mcrz0kwq0adb1nr83yqdq6qp1p1445p914qjsh";
};
propagatedBuildInputs = [

View File

@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "azure-servicefabric";
version = "6.4.0.0";
version = "6.5.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "f049e8c4a179f1277f2ec60158f88caf14a50f7df491fc6841e360cd61746da1";
sha256 = "02q32rc3vmg3kpi92s2y2ic47s3mi9qjcvzvrpjdlzji8lhd9w45";
};
propagatedBuildInputs = [

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "magic-wormhole-transit-relay";
version = "0.1.2";
version = "0.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "b13f1bfab295150b25958014d93fcd9f744d92011d186d7381575465587b8587";
sha256 = "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b";
};
propagatedBuildInputs = [ twisted ];

View File

@@ -2,22 +2,23 @@
, requests, filetype, pyparsing, configparser, arxiv2bib
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
, pylibgen, click, python-slugify, habanero, isbnlib
, prompt_toolkit, pygments
, prompt_toolkit, pygments, stevedore, tqdm, lxml
, python-doi, isPy3k
#, optional, dependencies
, jinja2, whoosh, pytest
, whoosh, pytest
, stdenv
}:
buildPythonPackage rec {
pname = "papis";
version = "0.8.2";
version = "0.9";
# Missing tests on Pypi
src = fetchFromGitHub {
owner = "papis";
repo = pname;
rev = "v${version}";
sha256 = "0sa4hpgjvqkjcmp9bjr27b5m5jg4pfspdc8nf1ny80sr0kzn72hb";
sha256 = "kzA8nlglbjHDPEB7HRAY2dza1Umn/OYUu+ydbA1OJ5Y=";
};
propagatedBuildInputs = [
@@ -25,10 +26,14 @@ buildPythonPackage rec {
pyyaml chardet beautifulsoup4 colorama bibtexparser
pylibgen click python-slugify habanero isbnlib
prompt_toolkit pygments
stevedore tqdm lxml
python-doi
# optional dependencies
jinja2 whoosh
whoosh
];
disabled = !isPy3k;
doCheck = !stdenv.isDarwin;
checkInputs = ([
@@ -42,7 +47,8 @@ buildPythonPackage rec {
# fail with 5.x
checkPhase = ''
HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \
-k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url and not test_export_yaml and not test_citations"
-k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url \
and not test_validate_arxivid and not test_downloader_getter"
'';
meta = {

View File

@@ -6,6 +6,7 @@
, contexter
, jinja2
, pytest
, pip
}:
buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
sha256 = "ec9a71e09ac7f43cc7b6c9d386384eb7b5c331bf6ea0e72ca559d87979397a95";
};
propagatedBuildInputs = [ click configobj contexter jinja2 pytest ];
propagatedBuildInputs = [ click configobj contexter pip jinja2 pytest ];
postPatch = ''
sed -i "s/'pip>=8,<10'/'pip'/" setup.py
@@ -27,6 +28,9 @@ buildPythonPackage rec {
# tests not included with pypi release
doCheck = false;
# Requires an old pip version
broken = true;
meta = with stdenv.lib; {
description = "Generate Nix expressions for Python packages";
homepage = https://github.com/johbo/pip2nix;

View File

@@ -0,0 +1,21 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k }:
buildPythonPackage rec {
pname = "python-doi";
version = "0.1.1";
src = fetchFromGitHub {
owner = "papis";
repo = "python-doi";
rev = "v${version}";
sha256 = "1wa5inh2a0drjswrnhjv6m23mvbfdgqj2jb8fya7q0armzp7l6fr";
};
disabled = !isPy3k;
meta = with stdenv.lib; {
description = "Python library to work with Document Object Identifiers (doi)";
homepage = https://github.com/alejandrogallo/python-doi;
maintainers = with maintainers; [ teto ];
};
}