Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: flexget: 2.10.40 -> 2.10.82 #28615

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
042150f
python.pkgs.urrlib3: 1.20 -> 1.22
Mic92 Aug 27, 2017
a0f5e17
python.pkgs.chardet: 2.3.0 -> 3.0.4
Mic92 Aug 27, 2017
450be31
python.pkgs.flask-compress: 1.3.2 -> 1.4.0
Mic92 Aug 27, 2017
6abe810
python.pkgs.flask-cors: 2.1.2 -> 3.0.2
Mic92 Aug 27, 2017
a1c9a92
python.pkgs.flask-restful: 0.3.5 -> 0.3.6
Mic92 Aug 27, 2017
2abe140
python.pkgs.flask-restplus_0_8: remove
Mic92 Aug 27, 2017
37a8bc7
python.pkgs.pytz: 2016.6.1 -> 2017.2
Mic92 Aug 27, 2017
9af41c6
python.pkgs.requests: 2.13.0 -> 2.18.4
Mic92 Aug 27, 2017
9bebc24
python.pkgs.tzlocal: 1.2.2 -> 1.4
Mic92 Aug 27, 2017
d0cfbb3
python.pkgs.werkzeug: 0.11.10 -> 0.12
Mic92 Aug 27, 2017
341f467
python.pkgs.tempora: 1.4 -> 1.8
Mic92 Aug 27, 2017
76dd323
python.pkgs.dateutil: 2.6.0 -> 2.6.1
Mic92 Aug 27, 2017
c35208b
python.pkgs.backports_unittest-mock: init at 1.3
Mic92 Aug 27, 2017
f6c1426
python.pkgs.cheroot: init at 5.5.0
Mic92 Aug 27, 2017
0febced
python.pkgs.portend: init at 2.1.2
Mic92 Aug 27, 2017
a4caee0
python.pkgs.beautifulsoup: 4.5.3 -> 4.6.0
Mic92 Aug 27, 2017
788899e
python.pkgs.cherrypy: 8.7.0 -> 11.0.0
Mic92 Aug 27, 2017
209a91f
python.pkgs.pytest-warnings: init at 0.3.0
Mic92 Aug 27, 2017
248f83a
python.pkgs.pytest-sugar: init at 0.9.0
Mic92 Aug 27, 2017
919d180
python.pkgs.flask: 0.12 -> 0.12.2
Mic92 Aug 27, 2017
75735cf
python.pkgs.jsonschema: 2.5.3 -> 2.6.0
Mic92 Aug 27, 2017
3c6d0f1
python.pkgs.vcversioner: 2.14.0.0 -> 2.16.0.0
Mic92 Aug 27, 2017
a744ff0
python.pkgs.jinja2: 2.9.5 -> 2.9.6
Mic92 Aug 27, 2017
5501185
guessit_2_0: init at 2.0.4
Mic92 Aug 27, 2017
2b1b248
flexget: 2.10.40 -> 2.10.82
Mic92 Aug 27, 2017
1b9b166
pandas: fix dateutil tests
Mic92 Aug 28, 2017
0e491a5
ansible_2_2/ansible_2_1: switch to overrideDerivation for jinja2
Mic92 Aug 28, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions pkgs/applications/networking/flexget/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
with python.pkgs;

buildPythonApplication rec {
version = "2.10.40";
version = "2.10.82";
name = "FlexGet-${version}";

src = fetchFromGitHub {
owner = "Flexget";
repo = "Flexget";
rev = version;
sha256 = "0hh21yv1lvdfi198snwjabfsdh04fnpjszpgg28wvg5pd1qq8lqv";
sha256 = "15508ihswfjbkzhf1f0qhn2ar1aiibz2ggp5d6r33icy8xwhpv09";
};

doCheck = true;
Expand All @@ -27,30 +27,41 @@ buildPythonApplication rec {
sed -i '/def test_non_ascii/i\ import pytest\
@pytest.mark.skip' flexget/tests/test_filesystem.py

substituteInPlace requirements.txt --replace "guessit<=2.0.4" "guessit"
substituteInPlace requirements.txt \
--replace "chardet==3.0.3" "chardet" \
--replace "rebulk==0.8.2" "rebulk" \
--replace "cherrypy==10.2.2" "cherrypy" \
--replace "portend==1.8" "portend" \
--replace "sqlalchemy==1.1.10" "sqlalchemy"
'';

# Disable 3 failing tests caused by guessit upgrade
# https://github.com/Flexget/Flexget/issues/1804
checkPhase = ''
export HOME=.
py.test --disable-pytest-warnings -k "not test_date_options and not test_ep_as_quality and not testFromGroup"
py.test --disable-pytest-warnings -k "not test_quality_failures \
and not test_group_quality \
and not crash_report \
and not test_multi_episode \
and not test_double_episodes \
and not test_inject_force \
and not test_double_prefered \
and not test_double"
'';

buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ];
propagatedBuildInputs = [
feedparser sqlalchemy pyyaml
feedparser sqlalchemy pyyaml chardet
beautifulsoup4 html5lib PyRSS2Gen pynzb
rpyc jinja2 requests dateutil jsonschema
pathpy guessit APScheduler
rpyc jinja2 jsonschema requests dateutil jsonschema
pathpy guessit_2_0 APScheduler
terminaltables colorclass
cherrypy flask flask-restful flask-restplus_0_8
cherrypy flask flask-restful flask-restplus
flask-compress flask_login flask-cors
pyparsing safe future zxcvbn-python ]
++ lib.optional (pythonOlder "3.4") pathlib
# enable deluge and transmission plugin support, if they're installed
++ lib.optional (config.deluge or false) deluge
++ lib.optional (transmission != null) transmissionrpc;
pyparsing safe future zxcvbn-python
werkzeug tempora cheroot rebulk portend
] ++ lib.optional (pythonOlder "3.4") pathlib
# enable deluge and transmission plugin support, if they're installed
++ lib.optional (config.deluge or false) deluge
++ lib.optional (transmission != null) transmissionrpc;

meta = {
homepage = https://flexget.com/;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, mock }:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "backports.unittest_mock";
version = "1.3";

src = fetchPypi {
inherit pname version;
sha256 = "0xdkx5wf5a2w2zd2pshk7z2cvbv6db64c1x6v9v1a18ja7bn9nf6";
};

propagatedBuildInputs = [ mock ];

buildInputs = [ setuptools_scm ];

meta = with stdenv.lib; {
description = "Provides a function install() which makes the mock module";
homepage = https://github.com/jaraco/backports.unittest_mock;
license = licenses.mit;
};
}
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/beautifulsoup4/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi, nose }:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "beautifulsoup4";
version = "4.6.0";

src = fetchPypi {
inherit pname version;
sha256 = "12cf0ygpz9srpfh9gx2f9ba0swa1rzypv3sm4r0hmjyw6b4nm2w0";
};

buildInputs = [ nose ];
checkPhase = ''
nosetests build
'';

meta = with stdenv.lib; {
homepage = http://crummy.com/software/BeautifulSoup/bs4/;
description = "HTML and XML parser";
license = licenses.mit;
maintainers = with maintainers; [ domenkozar ];
};
}
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/chardet/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi
, pytest, pytestrunner, hypothesis }:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "chardet";
version = "3.0.4";

src = fetchPypi {
inherit pname version;
sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
};

buildInputs = [ pytest pytestrunner hypothesis ];

meta = with stdenv.lib; {
homepage = https://github.com/chardet/chardet;
description = "Universal encoding detector";
license = licenses.lgpl2;
maintainers = with maintainers; [ domenkozar ];
};
}
28 changes: 28 additions & 0 deletions pkgs/development/python-modules/cheroot/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, fetchPypi, buildPythonPackage
, six
, coverage, codecov, pytest, pytestcov, pytest-sugar, portend
, backports_unittest-mock, setuptools_scm }:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "cheroot";
version = "5.5.0";

src = fetchPypi {
inherit pname version;
sha256 = "1fhyk8lgs2blfx4zjvwsy6f0ynrs5fwnnr3qf07r6c4j3gwlkqsr";
};

propagatedBuildInputs = [ six ];
buildInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock setuptools_scm ];

checkPhase = ''
py.test cheroot
'';

meta = with stdenv.lib; {
description = "High-performance, pure-Python HTTP";
homepage = https://github.com/cherrypy/cheroot;
license = licenses.mit;
};
}
25 changes: 25 additions & 0 deletions pkgs/development/python-modules/cherrypy/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
, pytest, setuptools_scm, pytestrunner
, six, cheroot, portend }:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "CherryPy";
version = "11.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "1037pvhab4my791vfzikm649ny52fj7x2q87cnncmbnqin6ghwan";
};

# wsgiserver.ssl_pyopenssl is broken on py3k.
doCheck = !isPy3k;
buildInputs = [ pytest setuptools_scm pytestrunner ];
propagatedBuildInputs = [ six cheroot portend ];

meta = with stdenv.lib; {
homepage = "http://www.cherrypy.org";
description = "A pythonic, object-oriented HTTP framework";
license = licenses.mit.bsd3;
};
}
12 changes: 6 additions & 6 deletions pkgs/development/python-modules/dateutil/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchurl, six }:
{ stdenv, buildPythonPackage, fetchPypi, six }:
buildPythonPackage rec {
pname = "dateutil";
name = "${pname}-${version}";
version = "2.6.0";
pname = "python-dateutil";
version = "2.6.1";

src = fetchurl {
url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
sha256 = "1lhq0hxjc3cfha101q02ld5ijlpfyjn2w1yh7wvpiy367pgzi8k2";
src = fetchPypi {
inherit pname version;
sha256 = "1jkahssf0ir5ssxc3ydbp8cpv77limn8d4s77szb2nrgl2r3h749";
};

propagatedBuildInputs = [ six ];
Expand Down
20 changes: 20 additions & 0 deletions pkgs/development/python-modules/flask-compress/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{ stdenv, fetchPypi, buildPythonPackage, flask }:

buildPythonPackage rec {
name = "${pname}-${version}";
version = "1.4.0";
pname = "Flask-Compress";

src = fetchPypi {
inherit pname version;
sha256 = "1cxdbdiyxkspg7vkchfmaqr7c6q79gwvakna3fjcc6nivps971j6";
};

propagatedBuildInputs = [ flask ];

meta = with stdenv.lib; {
description = "Compress responses in your Flask app with gzip";
homepage = "https://libwilliam.github.io/flask-compress/";
license = licenses.mit;
};
}
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/flask-cors/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, fetchPypi, buildPythonPackage
, nose, flask, six }:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "Flask-Cors";
version = "3.0.2";

src = fetchPypi {
inherit pname version;
sha256 = "1mnsyyqn8akin2vz98b9fbv63hcvwmfkaapsglw5jizdkmaz628a";
};

buildInputs = [ nose ];
propagatedBuildInputs = [ flask six ];

meta = with stdenv.lib; {
description = "A Flask extension adding a decorator for CORS support";
homepage = https://github.com/corydolphin/flask-cors;
license = with licenses; [ mit ];
};
}
29 changes: 29 additions & 0 deletions pkgs/development/python-modules/flask-restful/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
, nose, mock, blinker
, flask, six, pytz, aniso8601, pycrypto
}:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "Flask-RESTful";
version = "0.3.6";

src = fetchPypi {
inherit pname version;
sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap";
};

# TypeError: Only byte strings can be passed to C code
patchPhase = if isPy3k then ''
rm tests/test_crypto.py tests/test_paging.py
'' else null;
buildInputs = [ nose mock blinker ];
propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ];
PYTHON_EGG_CACHE = "`pwd`/.egg-cache";

meta = with stdenv.lib; {
homepage = "http://flask-restful.readthedocs.io/";
description = "REST API building blocks for Flask";
license = licenses.bsd3;
};
}
42 changes: 0 additions & 42 deletions pkgs/development/python-modules/flask-restplus/0.8.nix

This file was deleted.

21 changes: 21 additions & 0 deletions pkgs/development/python-modules/flask/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ stdenv, buildPythonPackage, fetchPypi
, itsdangerous, click, werkzeug, jinja2 }:

buildPythonPackage rec {
name = "${pname}-${version}";
version = "0.12.2";
pname = "Flask";

src = fetchPypi {
inherit pname version;
sha256 = "1hfs2jr2m5lr51xd4gblb28rncd0xrpycz6c07cyqsbv4dhl9x29";
};

propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ];

meta = with stdenv.lib; {
homepage = http://flask.pocoo.org/;
description = "A microframework based on Werkzeug, Jinja 2, and good intentions";
license = licenses.bsd3;
};
}
32 changes: 32 additions & 0 deletions pkgs/development/python-modules/guessit/2.0.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestrunner
, dateutil
, babelfish
, rebulk
}:

buildPythonPackage rec {
pname = "guessit";
version = "2.0.4";
name = "${pname}-${version}";

src = fetchPypi {
inherit pname version;
sha256 = "1cfcgb0px6i9jl8nwkx8j06j4y6p5975a9pfmd8lcacwr8gy4wjg";
};

# Tests require more packages.
doCheck = false;
buildInputs = [ pytestrunner ];
propagatedBuildInputs = [
dateutil babelfish rebulk
];

meta = {
homepage = http://pypi.python.org/pypi/guessit;
license = lib.licenses.lgpl3;
description = "A library for guessing information from video files";
};
}
Loading