diff --git a/pkgs/development/python-modules/opencensus-context/default.nix b/pkgs/development/python-modules/opencensus-context/default.nix new file mode 100644 index 000000000000..692b2c307913 --- /dev/null +++ b/pkgs/development/python-modules/opencensus-context/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, fetchPypi +, lib +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "opencensus-context"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-oDEIw8ENjIC7Xd9cih8DMWH6YZcqmRf5ubOhhRfwCIw="; + }; + + pythonNamespaces = [ + "opencensus.common" + ]; + + doCheck = false; # No tests in archive + + meta = with lib; { + description = "OpenCensus Runtime Context"; + homepage = "https://github.com/census-instrumentation/opencensus-python/tree/master/context/opencensus-context"; + license = licenses.asl20; + maintainers = with maintainers; [ billhuang ]; + }; +} diff --git a/pkgs/development/python-modules/opencensus/default.nix b/pkgs/development/python-modules/opencensus/default.nix index 0690da3d7ba9..7cf85104b61b 100644 --- a/pkgs/development/python-modules/opencensus/default.nix +++ b/pkgs/development/python-modules/opencensus/default.nix @@ -1,24 +1,11 @@ { buildPythonPackage , fetchPypi , lib -, python , unittestCheckHook , google-api-core +, opencensus-context }: -let - opencensus-context = buildPythonPackage rec { - pname = "opencensus-context"; - version = "0.1.3"; - - checkInputs = [ unittestCheckHook ]; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-oDEIw8ENjIC7Xd9cih8DMWH6YZcqmRf5ubOhhRfwCIw="; - }; - }; -in buildPythonPackage rec { pname = "opencensus"; version = "0.11.0"; @@ -28,23 +15,20 @@ buildPythonPackage rec { sha256 = "sha256-AmIWq6uJ2U2FBJLz3GWVAFXsT4QRX6bHvq/7pEo0bkI="; }; - buildInputs = [ - # opencensus-context is embedded in opencensus + propagatedBuildInputs = [ + google-api-core opencensus-context ]; - propagatedBuildInputs = [ - google-api-core + pythonNamespaces = [ + "opencensus.common" ]; - postInstall = '' - ln -sf ${opencensus-context}/${python.sitePackages}/opencensus/common/runtime_context \ - $out/${python.sitePackages}/opencensus/common/ - ''; + doCheck = false; # No tests in sdist - checkInputs = [ unittestCheckHook ]; - - pythonImportsCheck = [ "opencensus" ]; + pythonImportsCheck = [ + "opencensus.common" + ]; meta = with lib; { description = "A stats collection and distributed tracing framework"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3dfd0b71e3b..e66ba66a5daf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6457,6 +6457,8 @@ self: super: with self; { opencensus = callPackage ../development/python-modules/opencensus { }; + opencensus-context = callPackage ../development/python-modules/opencensus-context { }; + opencv3 = toPythonModule (pkgs.opencv3.override { enablePython = true; pythonPackages = self;