Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f8c2f75
pythonPackages.scrapy-deltafetch: Disable tests
SuperSandro2000 Jan 8, 2021
1d12368
pythonPackages.scrapy-splash: Fix dependencies, disable tests
SuperSandro2000 Jan 8, 2021
733db11
python3Packages.keep: Disable check phase
SuperSandro2000 Jan 8, 2021
b795b57
python3Packages.swspotify: Fix dependencies
SuperSandro2000 Jan 8, 2021
7ed180f
pythonPackages.python-jsonrpc-server: 0.3.4 -> 0.4.0
SuperSandro2000 Jan 9, 2021
63d5e25
pythonPackages.python-language-server: 0.34.1 -> 0.36.2
SuperSandro2000 Jan 9, 2021
3428107
pythonPackage.spyder: Fix dependencies
SuperSandro2000 Jan 9, 2021
d132cb1
pythonPackages.pyls-spyder: Init at 0.3.0
SuperSandro2000 Jan 9, 2021
0e780ce
nagstamon: Mark as broken
SuperSandro2000 Jan 9, 2021
981ed50
pythonPackages.three-merge: Init at 0.1.1
SuperSandro2000 Jan 9, 2021
0a1a3ad
gnomecast: Disable tests
SuperSandro2000 Jan 9, 2021
55444ed
nasc: Fix compilation with gcc10
SuperSandro2000 Jan 9, 2021
aa3a789
pythonPackages.cliff: Fix dependencies
SuperSandro2000 Jan 9, 2021
eea84e2
pythonPackages.notmuch2: Disable tests
SuperSandro2000 Jan 9, 2021
65d9252
pythonPackages.notmuch: Disable tests
SuperSandro2000 Jan 9, 2021
7d08eaa
pythonPackages.pyhaversion: Mark >= Python 3.8 only, disable tests
SuperSandro2000 Jan 9, 2021
e6925c9
lieer: Disable tests
SuperSandro2000 Jan 9, 2021
0a79e76
pythonPackages.worldengine: Cleanups, fix tests
SuperSandro2000 Jan 9, 2021
fd0ac74
pythonPackages.xdot: Disable test
SuperSandro2000 Jan 9, 2021
32c1d61
pythonPackages.geopandas: Disable tests on darwin
SuperSandro2000 Jan 10, 2021
cb9b3f1
pythonPackages.guestfs: Disable tests
SuperSandro2000 Jan 10, 2021
fdd065c
pythonPackages.scrapy: Fix tests on darwin
SuperSandro2000 Jan 10, 2021
112fa6f
pythonPackages.pytil: Fix tests with darwin sandbox
SuperSandro2000 Jan 10, 2021
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
14 changes: 9 additions & 5 deletions pkgs/applications/networking/lieer/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@ python3Packages.buildPythonApplication rec {
setuptools
];

# no tests
doCheck = false;
pythonImportsCheck = [ "lieer" ];

meta = with lib; {
description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail";
longDescription = ''
description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail";
longDescription = ''
This program can pull email and labels (and changes to labels)
from your GMail account and store them locally in a maildir with
the labels synchronized with a notmuch database. The changes to
tags in the notmuch database may be pushed back remotely to your
GMail account.
'';
homepage = "https://lieer.gaute.vetsj.com/";
homepage = "https://lieer.gaute.vetsj.com/";
repositories.git = "https://github.com/gauteh/lieer.git";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ flokli kaiha ];
license = licenses.gpl3Plus;
maintainers = with maintainers; [ flokli kaiha ];
};
}
11 changes: 11 additions & 0 deletions pkgs/applications/science/math/nasc/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib, stdenv
, fetchFromGitHub
, pkgconfig
, fetchpatch
, python3
, meson
, ninja
Expand Down Expand Up @@ -31,6 +32,16 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};

patches = [
# fix compilation with gcc10
(fetchpatch {
url = "https://github.com/parnold-x/libqalculate/commit/4fa8f2cceada128ef19f82407226b2c230b780d5.patch";
extraPrefix = "subprojects/libqalculate/";
stripLen = "1";
sha256 = "0kbff623zl0s6yx5avx068f2apwzxzvihjahja4qhlkqkhhzj9dm";
})
];

nativeBuildInputs = [
glib # post_install.py
gtk3 # post_install.py
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/video/gnomecast/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ buildPythonApplication rec {
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]})
'';

# no tests
doCheck = false;

meta = with lib; {
description = "A native Linux GUI for Chromecasting local files";
homepage = "https://github.com/keredson/gnomecast";
Expand Down
22 changes: 11 additions & 11 deletions pkgs/development/python-modules/cliff/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
, six
, stevedore
, pyyaml
, unicodecsv
, cmd2
, pytest
, mock
, pytestCheckHook
, testtools
, fixtures
, which
}:

buildPythonPackage rec {
Expand All @@ -32,20 +31,21 @@ buildPythonPackage rec {
stevedore
pyyaml
cmd2
unicodecsv
];

# remove version constraints
postPatch = ''
sed -i '/cmd2/c\cmd2' requirements.txt
sed -i -e '/cmd2/c\cmd2' -e '/PrettyTable/c\PrettyTable' requirements.txt
'';

checkInputs = [ fixtures mock pytest testtools ];
checkInputs = [ fixtures pytestCheckHook testtools which ];
# add some tests
checkPhase = ''
pytest cliff/tests/test_{utils,app,command,help,lister}.py \
-k 'not interactive_mode'
'';
pytestFlagsArray = [
"cliff/tests/test_utils.py"
"cliff/tests/test_app.py"
"cliff/tests/test_command.py"
"cliff/tests/test_help.py"
"cliff/tests/test_lister.py"
];

meta = with lib; {
description = "Command Line Interface Formulation Framework";
Expand Down
9 changes: 5 additions & 4 deletions pkgs/development/python-modules/geopandas/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ buildPythonPackage rec {
})
];

checkInputs = [ pytestCheckHook Rtree ];
disabledTests = [ "web" ];
pytestFlagsArray = [ "geopandas" ];

propagatedBuildInputs = [
pandas
shapely
Expand All @@ -41,6 +37,11 @@ buildPythonPackage rec {
pyproj
];

doCheck = !stdenv.isDarwin;
checkInputs = [ pytestCheckHook Rtree ];
disabledTests = [ "web" ];
pytestFlagsArray = [ "geopandas" ];

meta = with lib; {
description = "Python geospatial data analysis framework";
homepage = "https://geopandas.org";
Expand Down
4 changes: 4 additions & 0 deletions pkgs/development/python-modules/guestfs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ buildPythonPackage rec {

propagatedBuildInputs = [ libguestfs qemu ];

# no tests
doCheck = false;
pythonImportsCheck = [ "guestfs" ];

meta = with lib; {
homepage = "https://libguestfs.org/guestfs-python.3.html";
description = "Use libguestfs from Python";
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/python-modules/keep/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ buildPythonPackage rec {
];

# no tests
doCheck = false;
pythonImportsCheck = [ "keep" ];

meta = with lib; {
Expand Down
7 changes: 6 additions & 1 deletion pkgs/development/python-modules/notmuch/2.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, buildPythonPackage
, notmuch
, python
Expand All @@ -13,6 +14,10 @@ buildPythonPackage {

buildInputs = [ python notmuch cffi ];

# no tests
doCheck = false;
pythonImportsCheck = [ "notmuch2" ];

meta = with lib; {
description = "Pythonic bindings for the notmuch mail database using CFFI";
homepage = "https://notmuchmail.org/";
Expand Down
7 changes: 6 additions & 1 deletion pkgs/development/python-modules/notmuch/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, buildPythonPackage
, notmuch
, python
Expand All @@ -16,6 +17,10 @@ buildPythonPackage {
notmuch/globals.py
'';

# no tests
doCheck = false;
pythonImportsCheck = [ "notmuch" ];

meta = with lib; {
description = "A Python wrapper around notmuch";
homepage = "https://notmuchmail.org/";
Expand Down
21 changes: 6 additions & 15 deletions pkgs/development/python-modules/pyhaversion/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
# propagatedBuildInputs
, pythonOlder
, aiohttp
, async-timeout
, semantic-version
# buildInputs
, pytestrunner
# checkInputs
, pytest
, pytest-asyncio
, aresponses
}:
buildPythonPackage rec {
pname = "pyhaversion";
version = "3.4.2";

# needs aiohttp which is py3k-only
disabled = !isPy3k;
disabled = pythonOlder "3.8";

src = fetchPypi {
inherit pname version;
Expand All @@ -35,15 +27,14 @@ buildPythonPackage rec {
pytestrunner
];

checkInputs = [
pytest
pytest-asyncio
aresponses
];
# no tests
doCheck = false;
pythonImportsCheck = [ "pyhaversion" ];

meta = with lib; {
description = "A python module to the newest version number of Home Assistant";
homepage = "https://github.com/ludeeus/pyhaversion";
license = with licenses; [ mit ];
maintainers = [ maintainers.makefu ];
};
}
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/pyls-spyder/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, python-language-server }:

buildPythonPackage rec {
pname = "pyls-spyder";
version = "0.3.0";

src = fetchPypi {
inherit pname version;
sha256 = "07apxh12b8ybkx5izr7pg8kbg5g5wgzw7vh5iy2n8dhiqarzp7s1";
};

propagatedBuildInputs = [ python-language-server ];

# no tests
doCheck = false;
pythonImportsCheck = [ "pyls_spyder" ];

meta = with lib; {
description = "Spyder extensions for the python-language-server";
homepage = "https://github.com/spyder-ide/pyls-spyder";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
28 changes: 5 additions & 23 deletions pkgs/development/python-modules/python-jsonrpc-server/default.nix
Original file line number Diff line number Diff line change
@@ -1,43 +1,25 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
, pytest, mock, pytestcov, coverage
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, pytestCheckHook, mock, pytestcov, coverage
, future, futures, ujson, isPy38
, fetchpatch
}:

buildPythonPackage rec {
pname = "python-jsonrpc-server";
version = "0.3.4";
version = "0.4.0";

src = fetchFromGitHub {
owner = "palantir";
repo = "python-jsonrpc-server";
rev = version;
sha256 = "027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd";
sha256 = "0pcf50qvcxqnz3db58whqd8z89cdph19pfs1whgfm0zmwbwk0lw6";
};

postPatch = ''
sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py
# https://github.com/palantir/python-jsonrpc-server/issues/36
sed -iEe "s!'ujson.*\$!'ujson',!" setup.py
'';

checkInputs = [
pytest mock pytestcov coverage
];

checkPhase = ''
pytest
'';

patches = [
(fetchpatch {
url = "https://github.com/palantir/python-jsonrpc-server/commit/0a04cc4e9d44233b1038b12d63cd3bd437c2374e.patch";
sha256 = "177zdnp1808r2pg189bvzab44l8i2alsgv04kmrlhhnv40h66qyg";
})
(fetchpatch {
url = "https://github.com/palantir/python-jsonrpc-server/commit/5af6e43d0c1fb9a6a29b96d38cfd6dbeec85d0ea.patch";
sha256 = "1gx7lc1jxar1ngqqfkdn21s46y1mfnjf7ky2886ydk53nkaba91m";
})
pytestCheckHook mock pytestcov coverage
];

propagatedBuildInputs = [ future ujson ]
Expand Down
45 changes: 17 additions & 28 deletions pkgs/development/python-modules/python-language-server/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, isPy27
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8
, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson
, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky
, # Allow building a limited set of providers, e.g. ["pycodestyle"].
providers ? ["*"]
# The following packages are optional and
Expand All @@ -21,33 +21,33 @@ in

buildPythonPackage rec {
pname = "python-language-server";
version = "0.34.1";
version = "0.36.2";

src = fetchFromGitHub {
owner = "palantir";
repo = "python-language-server";
rev = version;
sha256 = "sha256-/tVzaoyUO6+7DSvnf3JxpcTY0rU+hHBu5qlru/ZTpxU=";
sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q";
};

patches = [
# https://github.com/palantir/python-language-server/pull/851
(fetchpatch {
url = "https://github.com/palantir/python-language-server/commit/f513f3297132492dd41e001d943980e6c4f40809.patch";
sha256 = "04c9hrb3dzlfchjk4625ipazyfcbq6qq2kj2hg3zf2xsny2jcvi5";
})
];
propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ]
++ stdenv.lib.optional (withProvider "autopep8") autopep8
++ stdenv.lib.optional (withProvider "mccabe") mccabe
++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle
++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle
++ stdenv.lib.optional (withProvider "pyflakes") pyflakes
++ stdenv.lib.optional (withProvider "pylint") pylint
++ stdenv.lib.optional (withProvider "rope") rope
++ stdenv.lib.optional (withProvider "yapf") yapf
++ stdenv.lib.optional isPy27 configparser
++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ];

postPatch = ''
# https://github.com/palantir/python-jsonrpc-server/issues/36
sed -i -e 's!ujson<=!ujson>=!' setup.py
'';

# The tests require all the providers, disable otherwise.
doCheck = providers == ["*"];

checkInputs = [
pytestCheckHook mock pytestcov coverage
pytestCheckHook mock pytestcov coverage flaky
# rope is technically a dependency, but we don't add it by default since we
# already have jedi, which is the preferred option
rope
Expand All @@ -67,20 +67,9 @@ buildPythonPackage rec {
"test_matplotlib_completions"
"test_snippet_parsing"
"test_numpy_hover"
"test_symbols"
] ++ stdenv.lib.optional isPy27 "test_flake8_lint";

propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ]
++ stdenv.lib.optional (withProvider "autopep8") autopep8
++ stdenv.lib.optional (withProvider "mccabe") mccabe
++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle
++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle
++ stdenv.lib.optional (withProvider "pyflakes") pyflakes
++ stdenv.lib.optional (withProvider "pylint") pylint
++ stdenv.lib.optional (withProvider "rope") rope
++ stdenv.lib.optional (withProvider "yapf") yapf
++ stdenv.lib.optional isPy27 configparser
++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ];

meta = with lib; {
homepage = "https://github.com/palantir/python-language-server";
description = "An implementation of the Language Server Protocol for Python";
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/pytile/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ buildPythonPackage rec {
pytestFlagsArray = [ "--ignore examples/" ];
pythonImportsCheck = [ "pytile" ];

__darwinAllowLocalNetworking = true;

meta = with lib; {
description = " Python API for Tile Bluetooth trackers";
longDescription = ''
Expand Down
Loading