diff options
Diffstat (limited to 'pkgs/development/python-modules')
40 files changed, 351 insertions, 99 deletions
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index c3a9224410d..6f1f9b0337e 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.15.1"; + version = "3.15.3"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-aUYerhg5iqKsZ5SW3dI6EpFnaB7dRGjXpIDVsjwS7vY="; + sha256 = "sha256-cmeCh54dwYwbL1AwGrPwTDp4F6VONclV7iu2Sm1g33Q="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 890f44b4ad3..68f166b3c7c 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -22,6 +22,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate sqlalchemy ]; + # crate is broken in nixpkgs, with SQLAlchemy > 1.3 + # Skip tests for now as they rely on it. + doCheck = false; + checkInputs = [ crate nose geojson ]; checkPhase = '' diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index 0a5cc01d929..0c88c378516 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.11"; + version = "2.10.12"; src = fetchPypi { inherit pname version; - sha256 = "0jr3cxqiami9k07g2kmvfp54iafbcnd1d66l8fdnaqka5bc19wdw"; + sha256 = "sha256-qWVW4tI5+Sg+FWVNQMGqhmgqTntD9Qtf8CK8jkK2mHg="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 4dd606c9adb..8584ba7166a 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,17 +23,17 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.1.0"; - sha256 = "0rrivq1g0vizah8zmf012lzig2xxfk5x1371k16s3nn4zfkwqqgm"; + version = "4.2.0"; + sha256 = "1l30j97q24klylchvbskdmp1xllswn9xskjvg4l0ra6pzfgq2zbk"; }; in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.2"; + version = "2.11.3"; src = fetchPypi { inherit pname version; - sha256 = "1syadgzn5ww5bhq9s2py4h1hkh11h7aac5b37zi8rw2xfvdc7r2s"; + sha256 = "sha256-DO0bT2cZftsntQk0yV1MtkTG1jXXLH+CbEQl3+RTdnQ="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index 12eed6bdb29..95b127a0db3 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -1,5 +1,5 @@ { lib -, fetchFromGitHub +, fetchPypi , buildPythonPackage , pycrypto , paramiko @@ -18,13 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.23"; + version = "2.9.24"; - src = fetchFromGitHub { - owner = "ansible"; - repo = "ansible"; - rev = "v${version}"; - sha256 = "0mikykpzyqpmaiczz53f71mcyc4qvahi9ckn7wgfx7sw7s2z3skk"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-DC9Tt75z3cNCPZZY/NGQeYl9Wx/FM8StVQ21ixea64o="; }; prePatch = '' diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index cc990617157..dea5776fb61 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -65,13 +65,13 @@ }: let - version = "2.1.1rc1"; + version = "2.1.2"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "1vzzmcfgqni9rkf7ggh8mswnm3ffwaishcz1ysrwx0a96ilhm9q2"; + sha256 = "sha256-Q0l2c1tuxcoE65zgdxnv/j1TIoQzaNoEFCYHvqN+Bzk="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix index c5508fb3303..f8733eeed62 100644 --- a/pkgs/development/python-modules/beniget/default.nix +++ b/pkgs/development/python-modules/beniget/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "beniget"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "062c893be9cdf87c3144fb15041cce4d81c67107c1591952cd45fdce789a0ff1"; + sha256 = "72bbd47b1ae93690f5fb2ad3902ce1ae61dcd868ce6cfbf33e9bad71f9ed8749"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix new file mode 100644 index 00000000000..1445c2046fb --- /dev/null +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -0,0 +1,49 @@ +{ buildPythonPackage +, fetchPypi +, lib +, distro +, pysnmp +, python-gnupg +, qrcode +, requests +, sseclient-py +, zfec +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "blocksat-cli"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "06ky5kahh8dm1d7ckid3fdwizvkh3g4aycm39r00kwxdlfca7bgf"; + }; + + propagatedBuildInputs = [ + distro + pysnmp + python-gnupg + qrcode + requests + sseclient-py + zfec + ]; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + # disable tests which require being connected to the satellite + "--ignore=blocksatcli/test_satip.py" + "--ignore=blocksatcli/api/test_net.py" + # disable tests which require being online + "--ignore=blocksatcli/api/test_order.py" + ]; + + meta = with lib; { + description = "Blockstream Satellite CLI"; + homepage = "https://github.com/Blockstream/satellite"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 639dc53babf..9b02160dc4e 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , filelock , flit-core , importlib-metadata @@ -8,6 +8,7 @@ , packaging , pep517 , pytest-mock +, pytest-rerunfailures , pytest-xdist , pytestCheckHook , pythonOlder @@ -17,13 +18,14 @@ buildPythonPackage rec { pname = "build"; - version = "0.3.0"; - + version = "0.5.1"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-DrlbLI13DXxMm5LGjCJ8NQu/ZfPsg1UazpCXwYzBX90="; + src = fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = version; + sha256 = "15hc9mbxsngfc9n805x8rk7yqbxnw12mpk6hfwcsldnfii1vg2ph"; }; nativeBuildInputs = [ @@ -42,20 +44,18 @@ buildPythonPackage rec { checkInputs = [ filelock - pytestCheckHook pytest-mock + pytest-rerunfailures pytest-xdist + pytestCheckHook ]; disabledTests = [ "test_isolation" "test_isolated_environment_install" "test_default_pip_is_never_too_old" - "test_build_isolated - StopIteration" - "test_build_raises_build_exception" - "test_build_raises_build_backend_exception" - "test_projectbuilder.py" - "test_projectbuilder.py" + "test_build" + "test_init" ]; pythonImportsCheck = [ "build" ]; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 9eebff1b1e6..0b574e9114c 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \ --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \ ${lib.optionalString stdenv.isDarwin - "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"} + "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block --deselect=cherrypy/test/test_config_server.py"} ''; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/convertdate/2.2.x.nix b/pkgs/development/python-modules/convertdate/2.2.x.nix index d67f4c5a344..1145a61ca4f 100644 --- a/pkgs/development/python-modules/convertdate/2.2.x.nix +++ b/pkgs/development/python-modules/convertdate/2.2.x.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5"; + sha256 = "07x1j6jgkmrzdpv2lhpp4n16621mpmlylvwdwsggdjivhzvc3x9q"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 07b9652e775..c4a698c5250 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -39,5 +39,11 @@ buildPythonPackage rec { description = "A Python client library for CrateDB"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; + # 2021-07-12 (@layus): Please unbreak when an update fixes compatibility + # with the version of SQLAlchemy in nixpkgs + # And also re-enable tests in pythonPackages.agate-sql. + # The version string below is intentionally split, so nixpkgs-update does + # not change it. That would make this warning pretty useless. + broken = assert version == "0.2"+"6.0"; true; }; } diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 5e5071e9308..3c41ccd1732 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.4.4"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d3393c878f575d3a9ca3b94471a3c89a6d960b35feb92f033c0de36cc9d934db"; + sha256 = "sha256-PovEdTTgypMx1ywy8ogbsTuT3tC83qs8gz+3z2HAqaU="; }; nativeBuildInputs = lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/editables/default.nix b/pkgs/development/python-modules/editables/default.nix new file mode 100644 index 00000000000..ee902d772c9 --- /dev/null +++ b/pkgs/development/python-modules/editables/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "editables"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "6918f16225258f24ef9800c2327e14eded42ddac344e77982380749464024f35"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + # Tests not included in archive. + doCheck = false; + + pythonImportsCheck = [ "editables" ]; + + meta = with lib; { + description = "Editable installations"; + maintainers = with maintainers; [ ]; + homepage = "https://github.com/pfmoore/editables"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/ev3dev2/default.nix b/pkgs/development/python-modules/ev3dev2/default.nix new file mode 100644 index 00000000000..f6233db68db --- /dev/null +++ b/pkgs/development/python-modules/ev3dev2/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +, pillow +}: + +buildPythonPackage rec { + pname = "ev3dev2"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "ev3dev"; + repo = "ev3dev-lang-python"; + rev = version; + sha256 = "XxsiQs3k5xKb+3RewARbvBbxaztdvdq3w5ZMgTq+kRc="; + fetchSubmodules = true; + }; + + postPatch = '' + echo "${version}\n" > RELEASE-VERSION + ''; + + propagatedBuildInputs = [ pillow ]; + + checkPhase = '' + chmod -R g+rw ./tests/fake-sys/devices/**/* + ${python.interpreter} -W ignore::ResourceWarning tests/api_tests.py + ''; + + meta = with lib; { + description = "Python language bindings for ev3dev"; + homepage = "https://github.com/ev3dev/ev3dev-lang-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 4d0d89d0f14..556317ed41f 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; - pythonImportCheck = [ "flask_restx" ]; + pythonImportsCheck = [ "flask_restx" ]; meta = with lib; { homepage = "https://flask-restx.readthedocs.io/en/${version}/"; diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index 38334d5cc6b..7e8d9f8d4ac 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "gast"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1"; + sha256 = "8109cbe7aa0f7bf7e4348379da05b8137ea1f059f073332c3c1cedd57db8541f"; }; checkInputs = [ astunparse ] ; meta = with lib; { diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index fccc1643216..fcd28362149 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { hypothesis ]; - pythonImportCheck = [ + pythonImportsCheck = [ "h2.connection" "h2.config" ]; diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 1bae0d633e3..8f359d39e2d 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -8,15 +8,17 @@ , isort , mock , pytest +, isPy27 }: buildPythonPackage rec { pname = "hcloud"; - version = "1.12.0"; + version = "1.13.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1fka4m3kbz52pksrjw3v42k611x5kl06dxrc7p5rb64jg6gayjfl"; + sha256 = "0f84nwr3ddzivlnswwmhvm3lgq9fy3n7nryy93xqpk5nxcd1ybpn"; }; propagatedBuildInputs = [ future requests python-dateutil ]; diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index b543002bc07..c62e4c74576 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.7.0"; + version = "1.7.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-tpk8wCKyrj3dOkBxj9UWcyrAb31uKtl2fRwwh7dAQGE="; + sha256 = "sha256-TNDQV1BOVVdvr0XAyWGcwgMbe4mV7J05hQeKVUqVT9s="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix index fd44f3e4480..8805c203903 100644 --- a/pkgs/development/python-modules/mesonpep517/default.nix +++ b/pkgs/development/python-modules/mesonpep517/default.nix @@ -4,7 +4,7 @@ , meson , ninja , intreehooks -, pytoml +, toml , pythonOlder }: @@ -12,17 +12,15 @@ buildPythonPackage rec { pname = "mesonpep517"; - version = "0.1.9999994"; + version = "0.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "b5bcca61024164c4a51d29e6921ea1f756d54197c8f052e4c66a2b8399aa9349"; + sha256 = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw="; }; - nativeBuildInputs = [ intreehooks ]; - - propagatedBuildInputs = [ pytoml ]; + propagatedBuildInputs = [ toml ]; # postPatch = '' # # Meson tries to detect ninja as well, so we should patch meson as well. diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index d4817480e57..597b6814281 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "4.0.3"; + version = "4.0.4"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "CLcmwobPrL6NiI/nw+/Dwho/r15owV16Jmt5OcfFqvo="; + sha256 = "g5G818Gq5EGyRIyg/ZW7guxMS0IyJ4nYaRjG/CtGhuc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 0eb13c732d7..f01bfa33186 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -1,22 +1,23 @@ { lib, stdenv , buildPythonPackage , fetchPypi -, isPy27 , python-dateutil , pkgs +, coreutils +, which }: buildPythonPackage rec { version = "2.0.3"; pname = "pync"; - disabled = ! isPy27; src = fetchPypi { inherit pname version; sha256 = "38b9e61735a3161f9211a5773c5f5ea698f36af4ff7f77fa03e8d1ff0caa117f"; }; - buildInputs = [ pkgs.coreutils ]; + nativeBuildInputs = [ coreutils ]; + checkInputs = [ which ]; propagatedBuildInputs = [ python-dateutil ]; preInstall = lib.optionalString stdenv.isDarwin '' @@ -25,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Wrapper for Mac OS 10.8 Notification Center"; - homepage = "https://pypi.python.org/pypi/pync/1.4"; + homepage = "https://pypi.python.org/pypi/pync"; license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 3df836ee562..981860c7a64 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; # pytest-astropy is a meta package and has no tests - checkPhase = ":"; + doCheck = false; meta = with lib; { description = "Meta-package containing dependencies for testing"; diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix index 7f6eee4906c..a679100d376 100644 --- a/pkgs/development/python-modules/python-wifi/default.nix +++ b/pkgs/development/python-modules/python-wifi/default.nix @@ -16,7 +16,6 @@ buildPythonPackage rec { }; meta = with lib; { - inherit version; description = "Read & write wireless card capabilities using the Linux Wireless Extensions"; homepage = "http://pythonwifi.tuxfamily.org/"; # From the README: "pythonwifi is licensed under LGPLv2+, however, the diff --git a/pkgs/development/python-modules/pythran/0001-hardcode-path-to-libgomp.patch b/pkgs/development/python-modules/pythran/0001-hardcode-path-to-libgomp.patch new file mode 100644 index 00000000000..14d2c2fbfd2 --- /dev/null +++ b/pkgs/development/python-modules/pythran/0001-hardcode-path-to-libgomp.patch @@ -0,0 +1,64 @@ +From 208fe98f10c580a5a2fb6a8cfdd56de109073925 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk <fridh@fridh.nl> +Date: Sat, 17 Jul 2021 18:36:27 +0200 +Subject: [PATCH] hardcode path to libgomp + +--- + omp/__init__.py | 40 ++++------------------------------------ + 1 file changed, 4 insertions(+), 36 deletions(-) + +diff --git a/omp/__init__.py b/omp/__init__.py +index bddae3063..9ba3678d8 100644 +--- a/omp/__init__.py ++++ b/omp/__init__.py +@@ -69,43 +69,11 @@ class OpenMP(object): + + def init_not_msvc(self): + """ Find OpenMP library and try to load if using ctype interface. """ +- # find_library() does not search automatically LD_LIBRARY_PATH +- paths = os.environ.get('LD_LIBRARY_PATH', '').split(':') ++ libgomp_path = "@gomp@" + +- for libomp_name in self.get_libomp_names(): +- if cxx is None or sys.platform == 'win32': +- # Note: Clang supports -print-file-name, but not yet for +- # clang-cl as of v12.0.0 (April '21) +- continue +- +- cmd = [cxx, '-print-file-name=' + libomp_name] +- # the subprocess can fail in various ways in that case just give up +- try: +- path = os.path.dirname(check_output(cmd).decode().strip()) +- if path: +- paths.append(path) +- except (OSError, CalledProcessError): +- pass +- +- # Try to load find libgomp shared library using loader search dirs +- libgomp_path = find_library("gomp") +- +- # Try to use custom paths if lookup failed +- for path in paths: +- if libgomp_path: +- break +- path = path.strip() +- if os.path.isdir(path): +- libgomp_path = find_library(os.path.join(str(path), "libgomp")) +- +- if not libgomp_path: +- raise ImportError("I can't find a shared library for libgomp," +- " you may need to install it or adjust the " +- "LD_LIBRARY_PATH environment variable.") +- else: +- # Load the library (shouldn't fail with an absolute path right?) +- self.libomp = ctypes.CDLL(libgomp_path) +- self.version = 45 ++ # Load the library (shouldn't fail with an absolute path right?) ++ self.libomp = ctypes.CDLL(libgomp_path) ++ self.version = 45 + + def __getattr__(self, name): + """ +-- +2.32.0 + diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 864234a37e2..10dc9f30572 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -1,4 +1,5 @@ { lib +, python , buildPythonPackage , fetchFromGitHub , pytestrunner @@ -12,19 +13,31 @@ , pytestCheckHook , scipy , isPy3k +, substituteAll }: -buildPythonPackage rec { +let + inherit (python) stdenv; + +in buildPythonPackage rec { pname = "pythran"; - version = "0.9.8post3"; + version = "0.9.12"; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; rev = version; - sha256 = "sha256-GCWjJlf7zpFzELR6wTF8FoJzJ3F/WdT1hHjY5A5h/+4="; + sha256 = "sha256-lQbVq4K/Q8RzlFhE+l3HPCmUGmauXawcKe31kfbUHsI="; }; + patches = [ + # Hardcode path to mp library + (substituteAll { + src = ./0001-hardcode-path-to-libgomp.patch; + gomp = "${stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + nativeBuildInputs = [ pytestrunner ]; @@ -62,7 +75,7 @@ buildPythonPackage rec { meta = { description = "Ahead of Time compiler for numeric kernels"; - homepage = https://github.com/serge-sans-paille/pythran; + homepage = "https://github.com/serge-sans-paille/pythran"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index dd1c7b2da5b..f559afb6a4d 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, setuptoolsDarcs -, setuptoolsTrial , simplejson +, mock , twisted , isPyPy }: @@ -17,12 +16,9 @@ buildPythonPackage rec { sha256 = "8c4d4bf668c559186389bb9bce99e4b1b871c09ba252a756ccaacd2b8f401848"; }; - buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []); - propagatedBuildInputs = [ twisted ]; + propagatedBuildInputs = [ simplejson ]; - # Tests fail because they try to write new code into the twisted - # package, apparently some kind of plugin. - doCheck = false; + checkInputs = [ mock twisted ]; prePatch = lib.optionalString isPyPy '' grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g" @@ -41,8 +37,9 @@ buildPythonPackage rec { we're not alone in wanting tools like these. ''; - homepage = "http://allmydata.org/trac/pyutil"; + homepage = "https://github.com/tpltnt/pyutil"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ prusnak ]; }; } diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 7c87431d80b..274cb0379c2 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -1,29 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , requests_oauthlib , simplejson +, pkce +, pytestCheckHook }: buildPythonPackage rec { pname = "pyvicare"; - version = "0.2.5"; + version = "1.0.0"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "PyViCare"; - inherit version; - sha256 = "16wqqjs238ad6znlz2gjadqj8891226bd02a1106xyz6vbbk2gdk"; + src = fetchFromGitHub { + owner = "somm15"; + repo = "PyViCare"; + rev = version; + sha256 = "05dlasx18fkmh4z1w8550yrb26fmsb5bc73wr9whmkasm32gpfl1"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ requests_oauthlib simplejson + pkce + ]; + + checkInputs = [ + pytestCheckHook ]; - # The published tarball on PyPI is incomplete and there are GitHub releases - doCheck = false; + postPatch = '' + substituteInPlace setup.py \ + --replace "version_config=True," 'version="${version}",' \ + --replace "'setuptools-git-versioning'" " " + ''; + pythonImportsCheck = [ "PyViCare" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index e2ed5367df5..64dafa7bca2 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "sha256-P7JzImidUXOD4DUMdfy3sgM5RISti23wNnLwDHPoiTA="; + sha256 = "sha256-Ai/8l2p3S/NE+uyz3eQ+rJSD/xYCsXf89aYijINQ18I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index f50ad558176..e5043ca941a 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -9,20 +9,20 @@ buildPythonPackage rec { pname = "rtoml"; - version = "0.6.1"; + version = "0.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "07bf30if1wmbqjp5n4ib43n6frx8ybyxc9fndxncq7aylkrhd7hy"; + sha256 = "sha256-h4vY63pDkrMHt2X244FssLxHsphsfjNd6gnVFUeZZTY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1q082sdac5vm4l3b45rfjp4vppp9y9qhagdjqqfdz8gdhm1k8yyy"; + sha256 = "05fwcs6w023ihw3gyihzbnfwjaqy40d6h0z2yas4kqkkvz9x4f8j"; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix index c1a950dc2ae..24812deb1f9 100644 --- a/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "skytemple-dtef"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "0hisg7gq6ph0as9vvx2p1h104bn6x2kx8y477p9zcqc71f3yrx82"; + sha256 = "0l2b66z5ngyas3ijbzwz2wizw46kz47f8jr729pzbg4wbqbqjihr"; }; propagatedBuildInputs = [ skytemple-files ]; diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 0df6419b526..90fae07c475 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-/S0otBujwO/IMiLKgA2o8wlD6xk1/DpwOAfemojV9NU="; + sha256 = "1i3045bqg9h7kcx83nlrm1pmikfpi817n0gb8da29m3mqzk7lwws"; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index 88ae80f7242..745e2775985 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "0jmsli3wg386y0lxwddpwp1xqxsn2bsy4d1f7dyh0jjz8lqiz03i"; + sha256 = "0jkx75z8j03jfr9kzd40ip0fy24sfc7f2x430mf48xin272mc87q"; }; buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 6ed265f6561..56dbc588c78 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.13"; + version = "0.3.14"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "G-Two"; repo = pname; - rev = "subaru-v${version}"; - sha256 = "0dqbb1iiil1vn97zxnpphn63bl8z0ibgyca90ynx958cy78kys0g"; + rev = "v${version}"; + sha256 = "0xwiw50xc0k8r00k33crsl5wb01n2dz5rzhy96y7vr3zj4kfypsp"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix new file mode 100644 index 00000000000..4204be03b94 --- /dev/null +++ b/pkgs/development/python-modules/tomli/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pytestCheckHook +, python-dateutil +}: + +buildPythonPackage rec { + pname = "tomli"; + version = "1.0.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hukkin"; + repo = pname; + rev = version; + sha256 = "sha256-ld0PsYnxVH3RbLG/NpvLDj9UhAe+QgwCQVXgGgqh8kE="; + }; + + nativeBuildInputs = [ flit-core ]; + + checkInputs = [ + pytestCheckHook + python-dateutil + ]; + + pythonImportsCheck = [ "tomli" ]; + + meta = with lib; { + description = "A Python library for parsing TOML, fully compatible with TOML v1.0.0"; + homepage = "https://github.com/hukkin/tomli"; + license = licenses.mit; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index b43927c063e..c132f50dbea 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.1.5"; + version = "3.1.6"; src = fetchPypi { inherit pname version; - sha256 = "00z9xl40czmqk0vmxjvmjvwb41r893l4dad7nj1nh6blw3kw28li"; + sha256 = "0b9y0v73ih142bygi66dxqx17j2x4dfvl7xnhmafj9yjmymbakbw"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index a4bbee43d01..8da1cf55b54 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { patches = [ (fetchpatch { name = "fix-pip10-compat.patch"; - url = " https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch"; + url = "https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch"; sha256 = "1lvqi2qfa3kxdz05ab2lc7xnd3piyvvnz9kla2jl4pchi876z17c"; }) ]; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index e20536b30eb..502eb5c4f68 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.11"; + version = "1.1.12"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fVUYrzIcW4jbxdhS/Bh8eu+aJPFOqj0LXjoQKw+FZdg="; + sha256 = "sha256-J7jh8FufGQzYbVhdOPbIpZCjfWZV6oOShy82QXL82b4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index bcec7a09251..391e1656749 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, setuptoolsDarcs , pyutil +, setuptoolsTrial +, twisted }: buildPythonPackage rec { @@ -14,16 +15,17 @@ buildPythonPackage rec { sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca"; }; - buildInputs = [ setuptoolsDarcs ]; propagatedBuildInputs = [ pyutil ]; + checkInputs = [ setuptoolsTrial twisted ]; + # argparse is in the stdlib but zfec doesn't know that. postPatch = '' sed -i -e '/argparse/d' setup.py ''; meta = with lib; { - homepage = "http://allmydata.org/trac/zfec"; + homepage = "https://github.com/tahoe-lafs/zfec"; description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; longDescription = '' Fast, portable, programmable erasure coding a.k.a. "forward @@ -34,6 +36,7 @@ buildPythonPackage rec { and Haskell API. ''; license = licenses.gpl2Plus; + maintainers = with maintainers; [ prusnak ]; }; } |