From a9558a193b2ee5b5040a4ba3fcdb4c383047e569 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 May 2021 11:43:07 +0200
Subject: python3Packages.labelbox: 2.5.1 -> 2.5.4

---
 pkgs/development/python-modules/labelbox/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'pkgs/development/python-modules/labelbox/default.nix')

diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index ce7cff4d79b8..e1ff7a98a022 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -4,28 +4,36 @@
 , requests
 , jinja2
 , pillow
+, dataclasses
+, pythonOlder
 , rasterio
 , shapely
 , ndjson
 , backoff
+, pydantic
 , google-api-core
 , backports-datetime-fromisoformat
 }:
 
 buildPythonPackage rec {
   pname = "labelbox";
-  version = "2.5.1";
+  version = "2.5.4";
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7f2cbc5d4869d8acde865ad519fc1cc85338247cd7cf534334f988a040679219";
+    sha256 = "sha256-L1KjP8Yzx9adTK84+Nf9JnirT4p3D3lwulWw6W1L/88=";
   };
 
   propagatedBuildInputs = [
     jinja2 requests pillow rasterio shapely ndjson backoff
-    google-api-core backports-datetime-fromisoformat
+    google-api-core backports-datetime-fromisoformat pydantic
   ];
 
+  postPatch = ''
+    substituteInPlace setup.py --replace "pydantic==1.8" "pydantic>=1.8"
+  '';
+
   # Test cases are not running on pypi or GitHub
   doCheck = false;
   pythonImportsCheck = [ "labelbox" ];
-- 
cgit v1.2.3


From 112a1f6fd7a27653964bc4b444ae4112edfe2cc1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 May 2021 13:34:09 +0200
Subject: python3Packages.labelbox: enable some tests

---
 .../python-modules/labelbox/default.nix            | 53 +++++++++++++++-------
 1 file changed, 37 insertions(+), 16 deletions(-)

(limited to 'pkgs/development/python-modules/labelbox/default.nix')

diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index e1ff7a98a022..957b8ad5fd1f 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -1,18 +1,20 @@
 { lib
+, backoff
+, backports-datetime-fromisoformat
 , buildPythonPackage
-, fetchPypi
-, requests
+, dataclasses
+, fetchFromGitHub
+, google-api-core
 , jinja2
+, ndjson
 , pillow
-, dataclasses
+, pydantic
+, pytest-cases
+, pytestCheckHook
 , pythonOlder
 , rasterio
+, requests
 , shapely
-, ndjson
-, backoff
-, pydantic
-, google-api-core
-, backports-datetime-fromisoformat
 }:
 
 buildPythonPackage rec {
@@ -20,27 +22,46 @@ buildPythonPackage rec {
   version = "2.5.4";
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-L1KjP8Yzx9adTK84+Nf9JnirT4p3D3lwulWw6W1L/88=";
+  src = fetchFromGitHub {
+    owner = "Labelbox";
+    repo = "labelbox-python";
+    rev = "v${version}";
+    sha256 = "0182klvm8bjcm8fkl9w8ypj12s026czgid8ldl6jjvmzhxpmss68";
   };
 
   propagatedBuildInputs = [
-    jinja2 requests pillow rasterio shapely ndjson backoff
-    google-api-core backports-datetime-fromisoformat pydantic
+    backoff
+    backports-datetime-fromisoformat
+    dataclasses
+    google-api-core
+    jinja2
+    ndjson
+    pillow
+    pydantic
+    rasterio
+    requests
+    shapely
   ];
 
   postPatch = ''
     substituteInPlace setup.py --replace "pydantic==1.8" "pydantic>=1.8"
   '';
 
-  # Test cases are not running on pypi or GitHub
-  doCheck = false;
+  checkInputs = [
+    pytest-cases
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    # Requires network access
+    "tests/integration"
+  ];
+
   pythonImportsCheck = [ "labelbox" ];
 
   meta = with lib; {
-    homepage = "https://github.com/Labelbox/Labelbox";
     description = "Platform API for LabelBox";
+    homepage = "https://github.com/Labelbox/labelbox-python";
     license = licenses.asl20;
     maintainers = with maintainers; [ rakesh4g ];
   };
-- 
cgit v1.2.3