diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 716b750948b5..a38421b31789 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -129,9 +129,11 @@ let version = "5.0.0"; src = oldAttrs.src.override { inherit version; - sha256 = "sha256-MTkw/d3nA9jjcCmjBL+RQpzRGu72PFfebayp2Vjh8lU="; + hash = "sha256-MTkw/d3nA9jjcCmjBL+RQpzRGu72PFfebayp2Vjh8lU="; }; - doCheck = false; + disabledTestPaths = [ + "t/unit/backends/test_mongodb.py" + ]; }); } ) diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 6156472896ad..c23c1d012da4 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -1,24 +1,46 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, case, vine }: +{ lib +, buildPythonPackage +, case +, fetchPypi +, pytestCheckHook +, pythonOlder +, vine +}: buildPythonPackage rec { pname = "amqp"; - version = "5.0.6"; + version = "5.0.9"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "03e16e94f2b34c31f8bf1206d8ddd3ccaa4c315f7f6a1879b7b1210d229568c2"; + hash = "sha256-Hl9wdCTlRAeMoZbnKuahSIfOdOAr0Sa+VLfAPJcb7xg="; }; - propagatedBuildInputs = [ vine ]; + propagatedBuildInputs = [ + vine + ]; + + checkInputs = [ + case + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook case ]; disabledTests = [ - "test_rmq.py" # requires network access + # Requires network access + "test_rmq.py" + ]; + + pythonImportsCheck = [ + "amqp" ]; meta = with lib; { homepage = "https://github.com/celery/py-amqp"; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; - license = licenses.lgpl21; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index cdd646fed147..eabb3521416e 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -7,6 +7,7 @@ , click-didyoumean , click-plugins , click-repl +, dnspython , fetchPypi , kombu , moto @@ -22,14 +23,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.2.1"; + version = "5.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "b41a590b49caf8e6498a57db628e580d5f8dc6febda0f42de5d783aed5b7f808"; + hash = "sha256-4s1BZnrZfU9qL0Zy0cam662hlMYZJTBYtfI3BKqtqoI="; }; propagatedBuildInputs = [ @@ -46,6 +47,7 @@ buildPythonPackage rec { checkInputs = [ boto3 case + dnspython moto pymongo pytest-celery @@ -54,6 +56,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace requirements/default.txt \ + --replace "setuptools>=59.1.1,<59.7.0" "setuptools" + ''; + disabledTestPaths = [ # test_eventlet touches network "t/unit/concurrency/test_eventlet.py" @@ -75,6 +82,6 @@ buildPythonPackage rec { description = "Distributed task queue"; homepage = "https://github.com/celery/celery/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 319461b98344..bb39b29c0d51 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -1,27 +1,28 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchPypi , amqp -, vine -, cached-property -, importlib-metadata , azure-servicebus +, buildPythonPackage +, cached-property , case +, fetchPypi +, importlib-metadata , Pyro4 , pytestCheckHook +, pythonOlder , pytz +, vine }: buildPythonPackage rec { pname = "kombu"; - version = "5.2.2"; + version = "5.2.3"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0f5d0763fb916808f617b886697b2be28e6bc35026f08e679697fc814b48a608"; + hash = "sha256-gakMHel+CNPbN9vxY+qvZnRF4QaMmL/YnwUaQOn2270="; }; propagatedBuildInputs = [ @@ -40,9 +41,14 @@ buildPythonPackage rec { pytz ]; + pythonImportsCheck = [ + "kombu" + ]; + meta = with lib; { description = "Messaging library for Python"; - homepage = "https://github.com/celery/kombu"; - license = licenses.bsd3; + homepage = "https://github.com/celery/kombu"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index 8fc895cfa44c..3f272a84b89b 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -1,22 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi -, case, pytest, pythonOlder }: +{ lib +, buildPythonPackage +, case +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "vine"; version = "5.0.0"; + format = "setuptools"; - disable = pythonOlder "2.7"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7d3b1624a953da82ef63462013bbd271d3eb75751489f9807598e8f340bd637e"; + hash = "sha256-fTsWJKlT2oLvY0YgE7vScdPrdXUUifmAdZjo80C9Y34="; }; - buildInputs = [ case pytest ]; + checkInputs = [ + case + pytestCheckHook + ]; + + pythonImportsCheck = [ + "vine" + ]; meta = with lib; { description = "Python promises"; homepage = "https://github.com/celery/vine"; license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; }; }