diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2023-01-15 14:30:54 +0100 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2023-01-15 15:08:54 +0100 |
commit | c25d0cde24220840033ab1007e5b3b732825804e (patch) | |
tree | a2669b6d9404af4235bcd38883d8d9571905ef60 | |
parent | 4ea83cec77fade2b709bbae9b42688266a6a50d0 (diff) | |
download | nixpkgs-c25d0cde24220840033ab1007e5b3b732825804e.tar nixpkgs-c25d0cde24220840033ab1007e5b3b732825804e.tar.gz nixpkgs-c25d0cde24220840033ab1007e5b3b732825804e.tar.bz2 nixpkgs-c25d0cde24220840033ab1007e5b3b732825804e.tar.lz nixpkgs-c25d0cde24220840033ab1007e5b3b732825804e.tar.xz nixpkgs-c25d0cde24220840033ab1007e5b3b732825804e.tar.zst nixpkgs-c25d0cde24220840033ab1007e5b3b732825804e.zip |
python3.pkgs.opencensus-context: init at 0.1.3
Split package into top-level Python library. We need to propagate it just like any other package, otherwise dependents cannot detect it during installation. The __init__.py collide since it uses old-style namespaces so we get rid of those. In the future we may need to extend the namespaces. This was enough for my dependency opencensus-ext-azure. Having it as a top-level Python is just common practice; there is no good reason not to.
-rw-r--r-- | pkgs/development/python-modules/opencensus-context/default.nix | 28 | ||||
-rw-r--r-- | pkgs/development/python-modules/opencensus/default.nix | 34 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 39 insertions, 25 deletions
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 00000000000..692b2c30791 --- /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 0690da3d7ba..7cf85104b61 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 - opencensus-context - ]; - propagatedBuildInputs = [ google-api-core + opencensus-context ]; - postInstall = '' - ln -sf ${opencensus-context}/${python.sitePackages}/opencensus/common/runtime_context \ - $out/${python.sitePackages}/opencensus/common/ - ''; + pythonNamespaces = [ + "opencensus.common" + ]; - checkInputs = [ unittestCheckHook ]; + doCheck = false; # No tests in sdist - 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 b4b340a42ba..584df45480e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6579,6 +6579,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; |