geeup - npm Package Compare versions

Comparing version 0.6.4 to 0.6.5

geeup.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: geeup
-Version: 0.6.4
+Version: 0.6.5
 Summary: Simple Client for Earth Engine Uploads
@@ -351,2 +351,7 @@ Home-page: https://github.com/samapriya/geeup
         
+        ### 0.6.5
+        - Fixed issue with iteritems for pandas >2.0.0
+        - Updated task running check and updated function
+        - Updated handling boolean for using last band as alpha mask
+        
         ### 0.6.4
@@ -353,0 +358,0 @@ - Added masking option to use last band as mask

geeup/__init__.py

@@ -5,2 +5,2 @@ # -*- coding: utf-8 -*-
 __email__ = "[e-mail]"
-__version__ = "0.6.4"
+__version__ = "0.6.5"

geeup/batch_uploader.py

@@ -5,3 +5,3 @@ from __future__ import print_function
 
-    Copyright 2016 Lukasz Tracewski
+    Copyright 2023 Samapriya Roy
 
@@ -23,28 +23,2 @@ Licensed under the Apache License, Version 2.0 (the "License");
 
-__Modifications_copyright__ = """
-
-    Copyright 2022 Samapriya Roy
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-"""
-__license__ = "Apache 2.0"
-
-"""
-Modifications to file:
-- Uses cookie based upload
-- Removed multipart upload
-- Uses polling
-"""
-
 import ast
@@ -89,2 +63,15 @@ import csv
 
+def task_counter():
+    ee.Initialize()
+    status = ["RUNNING", "PENDING"]
+    task_count = len(
+        [
+            task
+            for task in ee.data.listOperations()
+            if task["metadata"]["state"] in status
+        ]
+    )
+    return task_count
+
+
 def upload(
@@ -139,11 +126,4 @@ user,
         # )
-        status = ["RUNNING", "PENDING"]
-        task_count = len(
-            [
-                task
-                for task in ee.data.listOperations()
-                if task["metadata"]["state"] in status
-            ]
-        )
-        while task_count >= 2500:
+        task_count = task_counter()
+        while task_count >= 2800:
             logging.info(
@@ -153,2 +133,3 @@ f"Total tasks running or submitted {task_count}: waiting for 5 minutes"
             time.sleep(300)
+            task_count = task_counter()
         filename = __get_filename_from_path(path=image_path)
@@ -173,3 +154,3 @@
             dd = (df.applymap(type) == str).all(0)
-            for ind, val in dd.iteritems():
+            for ind, val in dd.items():
                 if val == True:
@@ -176,0 +157,0 @@ slist.append(ind)

geeup/geeup.py

@@ -569,2 +569,3 @@ from .batch_uploader import upload
         default=False,
+        choices=('True', 'False', 't', 'f'),
         help="Binary to use last band for mask True or False",
@@ -571,0 +572,0 @@ )

PKG-INFO

 Metadata-Version: 2.1
 Name: geeup
-Version: 0.6.4
+Version: 0.6.5
 Summary: Simple Client for Earth Engine Uploads
@@ -351,2 +351,7 @@ Home-page: https://github.com/samapriya/geeup
         
+        ### 0.6.5
+        - Fixed issue with iteritems for pandas >2.0.0
+        - Updated task running check and updated function
+        - Updated handling boolean for using last band as alpha mask
+        
         ### 0.6.4
@@ -353,0 +358,0 @@ - Added masking option to use last band as mask

README.md

@@ -343,2 +343,7 @@ # geeup: Simple CLI for Earth Engine Uploads
 
+### 0.6.5
+- Fixed issue with iteritems for pandas >2.0.0
+- Updated task running check and updated function
+- Updated handling boolean for using last band as alpha mask
+
 ### 0.6.4
@@ -345,0 +350,0 @@ - Added masking option to use last band as mask

setup.py

@@ -18,3 +18,3 @@ import os
     name="geeup",
-    version="0.6.4",
+    version="0.6.5",
     packages=find_packages(),
@@ -21,0 +21,0 @@ url="https://github.com/samapriya/geeup",

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Worsened metrics

Total package byte prevSize

153364

-0.02%

Lines of code

1539

-0.84%