Merge master into staging-next
This commit is contained in:
@@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.8.0";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
sha256 = "sha256-AjUpxdY/5IoWMBtufP3OVnMpUwpxgpCNWoydH1w+t+Y=";
|
||||
sha256 = "sha256-lIyDYt6OsBOPq1ytD4B4JxX7JeSGWprH2kqqFMzZcGY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, pymysql
|
||||
, pytest
|
||||
, isPy27
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -18,6 +19,14 @@ buildPythonPackage rec {
|
||||
sha256 = "1qvy3phbsxp55161dnppjfx2m1kn82v0irc3xzqw0adfd81vaiad";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# vendor functions previously provided by pymysql.util
|
||||
url = "https://github.com/aio-libs/aiomysql/pull/554/commits/919b997a9de7f53d721af76762fba425e306531e.patch";
|
||||
sha256 = "V1VYyqr6RwTXoVoGVyMuJst6uqTuuHbpMOpLoVZO1XA=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pymysql
|
||||
];
|
||||
|
||||
@@ -1,30 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, certifi
|
||||
, chardet
|
||||
, fetchFromGitHub
|
||||
, deprecated
|
||||
, idna
|
||||
, oauthlib
|
||||
, requests
|
||||
, requests_oauthlib
|
||||
, six
|
||||
, urllib3
|
||||
, pytestrunner
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "atlassian-python-api";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7ef384a91a790c807336e2bd6b7554284691aadd6d7413d199baf752dd84c53e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "atlassian-api";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-J0/CtfBtOdWReKQS/VvOL/3r+j4zJfnv/ICIXepKUvc=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestrunner pytest ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ];
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
, osqp
|
||||
, scipy
|
||||
, scs
|
||||
, useOpenmp ? true
|
||||
, useOpenmp ? (!stdenv.isDarwin)
|
||||
# Check inputs
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, gcc-unwrapped
|
||||
@@ -12,9 +13,11 @@ buildPythonPackage rec {
|
||||
sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
postPatch = let
|
||||
libstdcpp = "${lib.getLib gcc-unwrapped}/lib/libstdc++${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
in ''
|
||||
substituteInPlace cxxfilt/__init__.py \
|
||||
--replace "find_any_library('stdc++', 'c++')" '"${lib.getLib gcc-unwrapped}/lib/libstdc++.so"'
|
||||
--replace "find_any_library('stdc++', 'c++')" '"${libstdcpp}"'
|
||||
'';
|
||||
|
||||
# no tests
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fritzconnection";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
|
||||
# no tests on PyPI
|
||||
src = fetchFromGitHub {
|
||||
owner = "kbr";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02w1hwbfwbh5xlq433myzv6ms7jqxg8kn3d6znq4ic22zprzf5r2";
|
||||
sha256 = "sha256-Iw7R+39rpoCTrRD74kBihF7AMcJWxy2xdPhKLznWdlo=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@@ -2,14 +2,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jq";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "77e747c6ad10ce65479f5f9064ab036483bf307bf71fdd7d6235ef895fcc506e";
|
||||
sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r";
|
||||
};
|
||||
|
||||
patches = [ ./jq-py-setup.patch ];
|
||||
patches = [
|
||||
# Removes vendoring
|
||||
./jq-py-setup.patch
|
||||
];
|
||||
|
||||
buildInputs = [ jq ];
|
||||
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
From 968ddf2bd773e800e46737fced743bd00af9aa0d Mon Sep 17 00:00:00 2001
|
||||
From: William Kral <william.kral@gmail.com>
|
||||
Date: Tue, 8 Sep 2020 22:04:24 -0700
|
||||
Subject: [PATCH] Vastly simplify setup.py for distro compatibility
|
||||
From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
|
||||
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
|
||||
Date: Fri, 7 May 2021 19:14:20 -0400
|
||||
Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
|
||||
|
||||
---
|
||||
setup.py | 101 ++-----------------------------------------------------
|
||||
1 file changed, 2 insertions(+), 99 deletions(-)
|
||||
setup.py | 98 +-------------------------------------------------------
|
||||
1 file changed, 1 insertion(+), 97 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index cb63f60..87380ed 100644
|
||||
index 663792c..3ebcabe 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1,114 +1,19 @@
|
||||
@@ -1,113 +1,19 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
import os
|
||||
@@ -79,8 +79,7 @@ index cb63f60..87380ed 100644
|
||||
- tarball_path=jq_lib_tarball_path,
|
||||
- lib_dir=jq_lib_dir,
|
||||
- commands=[
|
||||
- ["autoreconf", "-i"],
|
||||
- ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
|
||||
- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
|
||||
- ["make"],
|
||||
- ])
|
||||
-
|
||||
@@ -93,7 +92,7 @@ index cb63f60..87380ed 100644
|
||||
-
|
||||
- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
|
||||
- if macosx_deployment_target:
|
||||
- os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target
|
||||
- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
|
||||
-
|
||||
- def run_command(args):
|
||||
- print("Executing: %s" % ' '.join(args))
|
||||
@@ -127,21 +126,19 @@ index cb63f60..87380ed 100644
|
||||
)
|
||||
|
||||
setup(
|
||||
@@ -120,8 +25,7 @@ setup(
|
||||
url='http://github.com/mwilliamson/jq.py',
|
||||
@@ -120,7 +26,6 @@ setup(
|
||||
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
|
||||
license='BSD 2-Clause',
|
||||
- ext_modules = [jq_extension],
|
||||
ext_modules = [jq_extension],
|
||||
- cmdclass={"build_ext": jq_build_ext},
|
||||
+ ext_modules=[jq_extension],
|
||||
classifiers=[
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Intended Audience :: Developers',
|
||||
@@ -137,4 +41,3 @@ setup(
|
||||
'Programming Language :: Python :: 3.8',
|
||||
@@ -137,4 +42,3 @@ setup(
|
||||
'Programming Language :: Python :: 3.9',
|
||||
],
|
||||
)
|
||||
-
|
||||
--
|
||||
2.28.0
|
||||
2.29.3
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
, numpy
|
||||
, scipy
|
||||
, jinja2
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, networkx
|
||||
, matplotlib
|
||||
, python-igraph
|
||||
@@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytestCheckHook
|
||||
networkx
|
||||
matplotlib
|
||||
python-igraph
|
||||
@@ -40,10 +40,6 @@ buildPythonPackage rec {
|
||||
ipywidgets
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest test --ignore test/test_drawing.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python implementation of Mapper algorithm for Topological Data Analysis";
|
||||
homepage = "https://kepler-mapper.scikit-tda.org/";
|
||||
|
||||
@@ -1,22 +1,20 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, pythonOlder
|
||||
, msgpack
|
||||
, nose
|
||||
, numpy
|
||||
, six
|
||||
, ruamel_yaml
|
||||
, msgpack
|
||||
, coverage
|
||||
, coveralls
|
||||
, pydantic
|
||||
, pymongo
|
||||
, lsof
|
||||
, ruamel_yaml
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "monty";
|
||||
version = "2021.3.3";
|
||||
disabled = isPy27; # uses type annotations
|
||||
disabled = pythonOlder "3.5"; # uses type annotations
|
||||
|
||||
# No tests in Pypi
|
||||
src = fetchFromGitHub {
|
||||
@@ -26,21 +24,30 @@ buildPythonPackage rec {
|
||||
sha256 = "1nbv0ys0fv70rgzskkk8gsfr9dsmm7ykim5wv36li840zsj83b1l";
|
||||
};
|
||||
|
||||
checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo];
|
||||
propagatedBuildInputs = [ six ruamel_yaml ];
|
||||
propagatedBuildInputs = [
|
||||
ruamel_yaml
|
||||
tqdm
|
||||
msgpack
|
||||
];
|
||||
|
||||
# test suite tries to decode bytes, but msgpack now returns a str
|
||||
# https://github.com/materialsvirtuallab/monty/pull/121
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_serialization.py \
|
||||
--replace ".decode('utf-8')" ""
|
||||
'';
|
||||
checkInputs = [
|
||||
nose
|
||||
numpy
|
||||
pydantic
|
||||
pymongo
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
substituteInPlace tests/test_os.py \
|
||||
--replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#'
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
nosetests -v
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems";
|
||||
longDescription = "
|
||||
|
||||
@@ -3,11 +3,12 @@
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, setuptools_scm
|
||||
, setuptools-scm
|
||||
, pyvcd
|
||||
, jinja2
|
||||
, importlib-resources
|
||||
, importlib-metadata
|
||||
, git
|
||||
|
||||
# for tests
|
||||
, pytestCheckHook
|
||||
@@ -30,7 +31,7 @@ buildPythonPackage rec {
|
||||
sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
nativeBuildInputs = [ setuptools-scm git ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
|
||||
@@ -1,45 +1,36 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, pip, pytest, click, six
|
||||
, setuptools_scm, git, glibcLocales, mock }:
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, buildPythonPackage
|
||||
, pip
|
||||
, pytest
|
||||
, pytest-xdist
|
||||
, click
|
||||
, setuptools-scm
|
||||
, git
|
||||
, glibcLocales
|
||||
, mock
|
||||
, pep517
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pip-tools";
|
||||
version = "6.0.1";
|
||||
version = "6.1.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3b0c7b95e8d3dfb011bb42cb38f356fcf5d0630480462b59c4d0a112b8d90281";
|
||||
sha256 = "sha256-QAv3finMpIwxq8IQBCkyu1LcwTjvTqTVLF20KaqK5u4=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
checkInputs = [ pytest git glibcLocales mock ];
|
||||
propagatedBuildInputs = [ pip click six setuptools_scm ];
|
||||
|
||||
disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) [
|
||||
# Depend on network tests:
|
||||
"test_allow_unsafe_option" #paramaterized, but all fail
|
||||
"test_annotate_option" #paramaterized, but all fail
|
||||
"test_editable_package_vcs"
|
||||
"test_editable_top_level_deps_preserved" # can't figure out how to select only one parameter to ignore
|
||||
"test_filter_pip_markers"
|
||||
"test_filter_pip_markes"
|
||||
"test_generate_hashes_all_platforms"
|
||||
"test_generate_hashes_verbose"
|
||||
"test_generate_hashes_with_editable"
|
||||
"test_generate_hashes_with_url"
|
||||
"test_generate_hashes_without_interfering_with_each_other"
|
||||
"test_get_file_hash_without_interfering_with_each_other"
|
||||
"test_get_hashes_local_repository_cache_miss"
|
||||
"test_realistic_complex_sub_dependencies"
|
||||
"test_stdin"
|
||||
"test_upgrade_packages_option"
|
||||
"test_url_package"
|
||||
"test_editable_package"
|
||||
"test_locally_available_editable_package_is_not_archived_in_cache_dir"
|
||||
];
|
||||
checkInputs = [ pytest git glibcLocales mock pytest-xdist ];
|
||||
propagatedBuildInputs = [ pip click setuptools-scm pep517 ];
|
||||
|
||||
checkPhase = ''
|
||||
export HOME=$(mktemp -d) VIRTUAL_ENV=1
|
||||
py.test -k "${disabledTests}"
|
||||
py.test -m "not network"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
, requests, websocket_client, python_magic
|
||||
, pytest, mock }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, requests
|
||||
, websocket_client
|
||||
, python_magic
|
||||
, cryptography
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pushbullet.py";
|
||||
@@ -11,13 +17,17 @@ buildPythonPackage rec {
|
||||
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests websocket_client python_magic ];
|
||||
propagatedBuildInputs = [ cryptography requests websocket_client python_magic ];
|
||||
|
||||
checkInputs = [ pytest mock ];
|
||||
|
||||
checkPhase = ''
|
||||
PUSHBULLET_API_KEY="" py.test -k "not test_e2e and not test_auth"
|
||||
preCheck = ''
|
||||
export PUSHBULLET_API_KEY=""
|
||||
'';
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
disabledTests = [
|
||||
"test_auth_fail"
|
||||
"test_auth_success"
|
||||
"test_decryption"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple python client for pushbullet.com";
|
||||
|
||||
@@ -28,6 +28,7 @@ buildPythonPackage rec {
|
||||
|
||||
preBuild = ''
|
||||
export CC=${stdenv.cc.targetPrefix}cc
|
||||
substituteInPlace pyvex_c/Makefile --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar'
|
||||
'';
|
||||
|
||||
# No tests are available on PyPI, GitHub release has tests
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
, nose
|
||||
, lxml
|
||||
, requests
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -17,7 +18,11 @@ buildPythonPackage rec {
|
||||
sha256 = "22524120d744b50d25ef6bfc7052637e4ead9e2afac92563231ec89848f5adf5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lxml requests ];
|
||||
propagatedBuildInputs = [
|
||||
lxml
|
||||
requests
|
||||
six
|
||||
];
|
||||
|
||||
# future is not used, and pathlib is installed part of python38+
|
||||
# w/o an external package
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, hypothesis
|
||||
@@ -17,6 +18,15 @@ buildPythonPackage rec {
|
||||
sha256 = "7a578aa0740e9ee2b48356fe1f347139190c4c72e27f303b3617054efd15df32";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes test failure on darwin. Filed upstream: https://github.com/naimetti/rfc3339-validator/pull/3.
|
||||
# Not yet merged.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rmcgibbo/rfc3339-validator/commit/4b6bb62c30bd158d3b4663690dcba1084ac31770.patch";
|
||||
sha256 = "0h9k82hhmp2xfzn49n3i47ws3rpm9lvfs2rjrds7hgx5blivpwl6";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
checkInputs = [ pytestCheckHook hypothesis strict-rfc3339 ];
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
, colorama
|
||||
, dataclasses
|
||||
, ipywidgets
|
||||
, poetry
|
||||
, poetry-core
|
||||
, pygments
|
||||
, typing-extensions
|
||||
, pytestCheckHook
|
||||
@@ -14,27 +14,33 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rich";
|
||||
version = "9.13.0";
|
||||
version = "10.1.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
# tests not included in pypi tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "willmcgugan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0si3rzhg8wfxw4aakkp8sr6nbzfa54rl0w92macd1338q90ha4ly";
|
||||
sha256 = "sha256-HH+k9uiK34yoqu83rknCIe2DpoqJRHkcqABuj8zjzqs=";
|
||||
};
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
CommonMark
|
||||
colorama
|
||||
ipywidgets
|
||||
pygments
|
||||
typing-extensions
|
||||
] ++ lib.optional (pythonOlder "3.7") dataclasses;
|
||||
] ++ lib.optional (pythonOlder "3.7") [
|
||||
dataclasses
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "rich" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,33 +1,43 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonAtLeast
|
||||
, fetchFromGitHub
|
||||
, colorcet
|
||||
, cryptography
|
||||
, flask
|
||||
, flask-compress
|
||||
, flask-cors
|
||||
, flask-sockets
|
||||
, gevent
|
||||
, imageio
|
||||
, numpy
|
||||
, scipy
|
||||
, pillow
|
||||
, gevent
|
||||
, wget
|
||||
, pyopenssl
|
||||
, scipy
|
||||
, six
|
||||
, colorcet
|
||||
, unidecode
|
||||
, urllib3
|
||||
, wget
|
||||
, deepdiff
|
||||
, pytestCheckHook
|
||||
, pytestcov
|
||||
, websocket_client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "runway-python";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740";
|
||||
src = fetchFromGitHub {
|
||||
owner = "runwayml";
|
||||
repo = "model-sdk";
|
||||
rev = version;
|
||||
sha256 = "1ww2wai1qnly8i7g42vhkkbs4yp7wi9x4fjdxsg9fl3izjra0zs2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorcet
|
||||
cryptography
|
||||
flask
|
||||
flask-compress
|
||||
flask-cors
|
||||
@@ -36,6 +46,7 @@ buildPythonPackage rec {
|
||||
imageio
|
||||
numpy
|
||||
pillow
|
||||
pyopenssl
|
||||
scipy
|
||||
six
|
||||
unidecode
|
||||
@@ -43,13 +54,30 @@ buildPythonPackage rec {
|
||||
wget
|
||||
];
|
||||
|
||||
# tests are not packaged in the released tarball
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"runway"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
deepdiff
|
||||
pytestCheckHook
|
||||
pytestcov
|
||||
websocket_client
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# these tests require network
|
||||
"test_file_deserialization_remote"
|
||||
"test_file_deserialization_absolute_directory"
|
||||
"test_file_deserialization_remote_directory"
|
||||
] ++ lib.optionals (pythonAtLeast "3.9") [
|
||||
# AttributeError: module 'base64' has no attribute 'decodestring
|
||||
# https://github.com/runwayml/model-sdk/issues/99
|
||||
"test_image_serialize_and_deserialize"
|
||||
"test_segmentation_serialize_and_deserialize_colormap"
|
||||
"test_segmentation_serialize_and_deserialize_labelmap"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Helper library for creating Runway models";
|
||||
homepage = "https://github.com/runwayml/model-sdk";
|
||||
|
||||
@@ -1,8 +1,17 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, pyusb
|
||||
, cython
|
||||
, git
|
||||
, pkgconfig
|
||||
, pytest-runner
|
||||
, setuptools-scm
|
||||
, future
|
||||
, numpy
|
||||
, pyusb
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, zipp
|
||||
}:
|
||||
|
||||
## Usage
|
||||
@@ -18,19 +27,35 @@ buildPythonPackage rec {
|
||||
owner = "ap--";
|
||||
repo = "python-seabreeze";
|
||||
rev = "v${version}";
|
||||
sha256 = "1lna3w1vsci35dhyi7qjvbb99gxvzk23k195c7by7kkrps844q1j";
|
||||
sha256 = "1hm9aalpb9sdp8s7ckn75xvyiacp5678pv9maybm5nz0z2h29ibq";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
git
|
||||
pkgconfig
|
||||
pytest-runner
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
numpy
|
||||
pyusb
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cp misc/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules
|
||||
cp os_support/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules
|
||||
'';
|
||||
|
||||
# underlying c libraries are tested and fail
|
||||
# (c libs are used with anaconda, which we don't care about as we use the alternative path, being that of pyusb).
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [ pyusb numpy ];
|
||||
# few backends enabled, but still some tests
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
zipp
|
||||
];
|
||||
|
||||
setupPyBuildFlags = [ "--without-cseabreeze" ];
|
||||
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, authlib
|
||||
, requests
|
||||
, pyopenssl
|
||||
, cryptography
|
||||
, idna
|
||||
, mock
|
||||
, isPy27
|
||||
, nose
|
||||
@@ -24,21 +22,20 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
authlib
|
||||
requests
|
||||
pyopenssl
|
||||
cryptography
|
||||
idna
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
pytz
|
||||
responses
|
||||
] ++ lib.optionals isPy27 [ mock ];
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "mock==1.0.1" "mock"
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
nosetests -v
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, colorama
|
||||
, sphinx
|
||||
, livereload
|
||||
}:
|
||||
@@ -14,10 +15,15 @@ buildPythonPackage rec {
|
||||
sha256 = "de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx livereload ];
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
sphinx
|
||||
livereload
|
||||
];
|
||||
|
||||
# No tests included.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "sphinx_autobuild" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -19,6 +19,7 @@ buildPythonPackage rec {
|
||||
description = "Python bindings for Linux SPI access through spidev";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "surepy";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "benleb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1adsnjya142bxdhfxqsi2qa35ylvdcibigs1wafjlxazlxs3mg0j";
|
||||
sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
@@ -43,11 +43,6 @@ buildPythonPackage rec {
|
||||
rich
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# halo is out-dated, https://github.com/benleb/surepy/pull/7
|
||||
substituteInPlace pyproject.toml --replace "^0.0.30" "^0.0.31"
|
||||
'';
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "surepy" ];
|
||||
|
||||
Reference in New Issue
Block a user