porder - pypi Package Compare versions

Comparing version 0.8.1 to 0.8.2

PKG-INFO

 Metadata-Version: 2.1
 Name: porder
-Version: 0.8.1
+Version: 0.8.2
 Summary: Simple CLI for Planet Orders v2
@@ -11,3 +11,3 @@ Home-page: https://github.com/samapriya/porder
         
-        [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3996650.svg)](https://doi.org/10.5281/zenodo.3996650)
+        [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4646280.svg)](https://doi.org/10.5281/zenodo.4646280)
         [![PyPI version](https://badge.fury.io/py/porder.svg)](https://badge.fury.io/py/porder)
@@ -29,4 +29,4 @@ [![Downloads](https://pepy.tech/badge/porder/month)](https://pepy.tech/project/porder/month)
         ```
-        Samapriya Roy, & Tyson L. Swetnam. (2020, August 23). tyson-swetnam/porder: porder: Simple CLI for Planet ordersV2 API (Version 0.7.8). Zenodo.
-        http://doi.org/10.5281/zenodo.3996650
+        Samapriya Roy, & Tyson L. Swetnam. (2021, March 29). tyson-swetnam/porder: porder: Simple CLI for Planet ordersV2 API (Version 0.8.1). Zenodo.
+        https://doi.org/10.5281/zenodo.4646280
         ```
@@ -67,3 +67,3 @@
         
-        If you have no errors and you have Python `2.7.14` or higher you should be good to go.
+        If you have no errors and you have Python `3.6+` or higher you should be good to go.
         
@@ -440,3 +440,4 @@ We also recommend installation within virtual environment. If you use [Conda](https://docs.conda.io/en/latest/)
         Blue Normalized Difference Vegetation Index (BNDVI) | [Wang et al 2007](https://www.sciencedirect.com/science/article/pii/S1672630807600274)
-        Transformed Vegetation Index (TVI) | [Broge and Leblanc 2000](https://www.sciencedirect.com/science/article/abs/pii/S0034425700001978)
+        Triangular Vegetation Index (TVI) | [Broge and Leblanc 2000](https://www.sciencedirect.com/science/article/abs/pii/S0034425700001978)
+        Transformed Vegetation Index (TVI) | [Deering et al 1975](https://www.scopus.com/record/display.uri?eid=2-s2.0-0016674266&origin=inward&txGid=d7c7bce489d9408e26cd62b928e93b38)
         Optimized Soil Adjusted Vegetation Index (OSAVI) | [Rondeaux et al 1996](https://www.sciencedirect.com/science/article/abs/pii/0034425795001867)
@@ -584,2 +585,9 @@ Enhanced Vegetation Index (EVI2) | [Jian et al 2008](https://www.sciencedirect.com/science/article/abs/pii/S0034425708001971)
         
+        ### v0.8.2
+        - [Pull request 48](https://github.com/tyson-swetnam/porder/pull/48)
+        - fixes typos and equations for bandmath and includes additional reference information
+        - increased pipwin check time to 60+ days
+        - added better version check and handling
+        - updated license date and minor fixes
+        
         ### v0.8.1
@@ -586,0 +594,0 @@ - Search function can now parse date and time. Enhancement from [Issue 47](https://github.com/tyson-swetnam/porder/issues/47)

porder.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: porder
-Version: 0.8.1
+Version: 0.8.2
 Summary: Simple CLI for Planet Orders v2
@@ -11,3 +11,3 @@ Home-page: https://github.com/samapriya/porder
         
-        [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3996650.svg)](https://doi.org/10.5281/zenodo.3996650)
+        [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4646280.svg)](https://doi.org/10.5281/zenodo.4646280)
         [![PyPI version](https://badge.fury.io/py/porder.svg)](https://badge.fury.io/py/porder)
@@ -29,4 +29,4 @@ [![Downloads](https://pepy.tech/badge/porder/month)](https://pepy.tech/project/porder/month)
         ```
-        Samapriya Roy, & Tyson L. Swetnam. (2020, August 23). tyson-swetnam/porder: porder: Simple CLI for Planet ordersV2 API (Version 0.7.8). Zenodo.
-        http://doi.org/10.5281/zenodo.3996650
+        Samapriya Roy, & Tyson L. Swetnam. (2021, March 29). tyson-swetnam/porder: porder: Simple CLI for Planet ordersV2 API (Version 0.8.1). Zenodo.
+        https://doi.org/10.5281/zenodo.4646280
         ```
@@ -67,3 +67,3 @@
         
-        If you have no errors and you have Python `2.7.14` or higher you should be good to go.
+        If you have no errors and you have Python `3.6+` or higher you should be good to go.
         
@@ -440,3 +440,4 @@ We also recommend installation within virtual environment. If you use [Conda](https://docs.conda.io/en/latest/)
         Blue Normalized Difference Vegetation Index (BNDVI) | [Wang et al 2007](https://www.sciencedirect.com/science/article/pii/S1672630807600274)
-        Transformed Vegetation Index (TVI) | [Broge and Leblanc 2000](https://www.sciencedirect.com/science/article/abs/pii/S0034425700001978)
+        Triangular Vegetation Index (TVI) | [Broge and Leblanc 2000](https://www.sciencedirect.com/science/article/abs/pii/S0034425700001978)
+        Transformed Vegetation Index (TVI) | [Deering et al 1975](https://www.scopus.com/record/display.uri?eid=2-s2.0-0016674266&origin=inward&txGid=d7c7bce489d9408e26cd62b928e93b38)
         Optimized Soil Adjusted Vegetation Index (OSAVI) | [Rondeaux et al 1996](https://www.sciencedirect.com/science/article/abs/pii/0034425795001867)
@@ -584,2 +585,9 @@ Enhanced Vegetation Index (EVI2) | [Jian et al 2008](https://www.sciencedirect.com/science/article/abs/pii/S0034425708001971)
         
+        ### v0.8.2
+        - [Pull request 48](https://github.com/tyson-swetnam/porder/pull/48)
+        - fixes typos and equations for bandmath and includes additional reference information
+        - increased pipwin check time to 60+ days
+        - added better version check and handling
+        - updated license date and minor fixes
+        
         ### v0.8.1
@@ -586,0 +594,0 @@ - Search function can now parse date and time. Enhancement from [Issue 47](https://github.com/tyson-swetnam/porder/issues/47)

porder/__init__.py

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

porder/bundles.json

@@ -0,0 +0,0 @@ {

porder/order_now.py

@@ -228,20 +228,23 @@ __copyright__ = """
                 elif items == "ndvi":
-                    dndvi = {"pixel_type": "32R", "ndvi": "(b4 - b3) / (b4+b3)"}
+                    dndvi = {"pixel_type": "32R", "ndvi": "(b4 - b3) / (b4 + b3)"}
                     dbmath["bandmath"].update(dndvi)
                 elif items == "gndvi":
-                    dgndvi = {"pixel_type": "32R", "gndvi": "(b4 - b2) / (b4+b2)"}
+                    dgndvi = {"pixel_type": "32R", "gndvi": "(b4 - b2) / (b4 + b2)"}
                     dbmath["bandmath"].update(dgndvi)
                 elif items == "ndwi":
-                    dndwi = {"pixel_type": "32R", "ndwi": "(b2 - b4) / (b4+b2)"}
+                    dndwi = {"pixel_type": "32R", "ndwi": "(b2 - b4) / (b4 + b2)"}
                     dbmath["bandmath"].update(dndwi)
                 elif items == "bndvi":
-                    bndvi = {"pixel_type": "32R", "bndvi": "(b4-b1)/(b4+b1)"}
+                    bndvi = {"pixel_type": "32R", "bndvi": "(b4 - b1) / (b4 + b1)"}
                     dbmath["bandmath"].update(bndvi)
-                elif items == "tvi":
-                    dtvi = {"pixel_type": "32R", "tvi": "((b4-b3)/(b4+b3)+0.5) ** 0.5"}
-                    dbmath["bandmath"].update(dtvi)
+                elif items == "tvi_deering":
+                    dtvi_deering = {"pixel_type": "32R", "tvi_deering": "(((b4 - b3) / (b4 + b3)) + 0.5) ** 0.5"}
+                    dbmath["bandmath"].update(dtvi_deering)
+                elif items == "tvi_brogeleblanc":
+                    dtvi_brogeleblanc = {"pixel_type": "32R", "tvi_brogeleblanc": "0.5 * ((120 * (b4 - b2) / 10000) - (200 * (b3 - b2) / 10000))"}
+                    dbmath["bandmath"].update(dtvi_brogeleblanc)                   
                 elif items == "osavi":
                     dosavi = {
                         "pixel_type": "32R",
-                        "osavi": "1.16 * (b4-b3)/(b4+b3+0.16)",
+                        "osavi": "1.16 * (b4 - b3) / (b4 + b3 + (0.16 * 10000))",
                     }
@@ -252,7 +255,7 @@ dbmath["bandmath"].update(dosavi)
                         "pixel_type": "32R",
-                        "evi2": "2.5 * (b4 - b3) / ((b4 + (2.4* b3) + 1))",
+                        "evi2": "2.5 * (b4 - b3) / (b4 + (2.4 * b3) + (1 * 10000))",
                     }
                     dbmath["bandmath"].update(devi2)
                 elif items == "sr":
-                    dsr = {"pixel_type": "32R", "sr": "(b4/b3)"}
+                    dsr = {"pixel_type": "32R", "sr": "(b4 / b3)"}
                     dbmath["bandmath"].update(dsr)
@@ -262,3 +265,3 @@ elif items == "msavi2":
                         "pixel_type": "32R",
-                        "msavi2": "(2 * b4 - ((2 * b4 + 1) ** 2 - 8 * (b4 - b3)) ** 0.5) / 2",
+                        "msavi2": "((2 * b4 / 10000) + 1 - (((((2 * b4 / 10000) + 1) ** 2) - (8 * (b4 - b3) / 10000)) ** 0.5)) / 2",
                     }
@@ -343,3 +346,3 @@ dbmath["bandmath"].update(dmsavi2)
                                     print(
-                                        "Simplifying geometry since Ordersv2 will only accept upto 500 vertex points"
+                                        "Simplifying geometry since Ordersv2 will only accept up to 500 vertex points"
                                     )
@@ -481,3 +484,3 @@ b = vw.simplify_feature(ft, number=495)
     else:
-        print("You can only use upto 5 bands")
+        print("You can only use up to 5 bands")
         sys.exit()
@@ -484,0 +487,0 @@

porder/ordstat.py

@@ -0,0 +0,0 @@ __copyright__ = """

porder/porder.py

@@ -5,3 +5,3 @@ from __future__ import print_function
 
-    Copyright 2019 Samapriya Roy
+    Copyright 2021 Samapriya Roy
 
@@ -66,3 +66,3 @@ Licensed under the Apache License, Version 2.0 (the "License");
         file_mod_time = os.stat(fullpath).st_mtime
-        if int((time.time() - file_mod_time) / 60) > 43200:
+        if int((time.time() - file_mod_time) / 60) > 90000:
             print("Refreshing your pipwin cache")
@@ -131,2 +131,19 @@ subprocess.call("pipwin refresh", shell=True)
 # Get package version
+class Solution:
+    def compareVersion(self, version1, version2):
+        versions1 = [int(v) for v in version1.split(".")]
+        versions2 = [int(v) for v in version2.split(".")]
+        for i in range(max(len(versions1), len(versions2))):
+            v1 = versions1[i] if i < len(versions1) else 0
+            v2 = versions2[i] if i < len(versions2) else 0
+            if v1 > v2:
+                return 1
+            elif v1 < v2:
+                return -1
+        return 0
+
+
+ob1 = Solution()
+
+# Get package version
 def porder_version():
@@ -138,6 +155,7 @@ url = "https://pypi.org/project/porder/"
     company = soup.find("h1")
-    if (
-        not pkg_resources.get_distribution("porder").version
-        == company.string.strip().split(" ")[-1]
-    ):
+    vcheck = ob1.compareVersion(
+        company.string.strip().split(" ")[-1],
+        pkg_resources.get_distribution("porder").version,
+    )
+    if vcheck == 1:
         print(
@@ -156,8 +174,23 @@ "\n"
         )
+    elif vcheck == -1:
+        print(
+            "\n"
+            + "========================================================================="
+        )
+        print(
+            "Possibly running staging code {} compared to pypi release {}".format(
+                pkg_resources.get_distribution("porder").version,
+                company.string.strip().split(" ")[-1],
+            )
+        )
+        print(
+            "========================================================================="
+        )
 
 
-def version_from_parser(args):
-    porder_version()
+porder_version()
 
 
+
+
 # Go to the readMe
@@ -530,3 +563,2 @@ def readme():
 
-porder_version()
 print("")
@@ -761,3 +793,3 @@
         nargs="+",
-        help="Add operations, delivery & notification clip|toar|harmonize|composite|zip|zipall|compression|projection|kernel|coreg|format|aws|azure|gcs|gee|email <Choose indices from>: ndvi|gndvi|bndvi|ndwi|tvi|osavi|evi2|msavi2|sr",
+        help="Add operations, delivery & notification clip|toar|harmonize|composite|zip|zipall|compression|projection|kernel|coreg|format|aws|azure|gcs|gee|email <Choose indices from>: ndvi|gndvi|ndwi|bndvi|tvi_deering|tvi_brogeleblanc|osavi|evi2|sr|msavi2",
         default=None,
@@ -764,0 +796,0 @@ )

README.md

 # porder: Simple CLI for Planet ordersV2 API   [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Use%20porder%20CLI%20with%20@planetlabs%20new%20ordersv2%20API&url=https://github.com/tyson-swetnam/porder)
 
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3996650.svg)](https://doi.org/10.5281/zenodo.3996650)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4646280.svg)](https://doi.org/10.5281/zenodo.4646280)
 [![PyPI version](https://badge.fury.io/py/porder.svg)](https://badge.fury.io/py/porder)
@@ -20,4 +20,4 @@ [![Downloads](https://pepy.tech/badge/porder/month)](https://pepy.tech/project/porder/month)
 ```
-Samapriya Roy, & Tyson L. Swetnam. (2020, August 23). tyson-swetnam/porder: porder: Simple CLI for Planet ordersV2 API (Version 0.7.8). Zenodo.
-http://doi.org/10.5281/zenodo.3996650
+Samapriya Roy, & Tyson L. Swetnam. (2021, March 29). tyson-swetnam/porder: porder: Simple CLI for Planet ordersV2 API (Version 0.8.1). Zenodo.
+https://doi.org/10.5281/zenodo.4646280
 ```
@@ -58,3 +58,3 @@
 
-If you have no errors and you have Python `2.7.14` or higher you should be good to go.
+If you have no errors and you have Python `3.6+` or higher you should be good to go.
 
@@ -431,3 +431,4 @@ We also recommend installation within virtual environment. If you use [Conda](https://docs.conda.io/en/latest/)
 Blue Normalized Difference Vegetation Index (BNDVI) | [Wang et al 2007](https://www.sciencedirect.com/science/article/pii/S1672630807600274)
-Transformed Vegetation Index (TVI) | [Broge and Leblanc 2000](https://www.sciencedirect.com/science/article/abs/pii/S0034425700001978)
+Triangular Vegetation Index (TVI) | [Broge and Leblanc 2000](https://www.sciencedirect.com/science/article/abs/pii/S0034425700001978)
+Transformed Vegetation Index (TVI) | [Deering et al 1975](https://www.scopus.com/record/display.uri?eid=2-s2.0-0016674266&origin=inward&txGid=d7c7bce489d9408e26cd62b928e93b38)
 Optimized Soil Adjusted Vegetation Index (OSAVI) | [Rondeaux et al 1996](https://www.sciencedirect.com/science/article/abs/pii/0034425795001867)
@@ -575,2 +576,9 @@ Enhanced Vegetation Index (EVI2) | [Jian et al 2008](https://www.sciencedirect.com/science/article/abs/pii/S0034425708001971)
 
+### v0.8.2
+- [Pull request 48](https://github.com/tyson-swetnam/porder/pull/48)
+- fixes typos and equations for bandmath and includes additional reference information
+- increased pipwin check time to 60+ days
+- added better version check and handling
+- updated license date and minor fixes
+
 ### v0.8.1
@@ -577,0 +585,0 @@ - Search function can now parse date and time. Enhancement from [Issue 47](https://github.com/tyson-swetnam/porder/issues/47)

setup.py

@@ -23,3 +23,3 @@ import sys
     name='porder',
-    version='0.8.1',
+    version='0.8.2',
     packages=['porder'],
@@ -26,0 +26,0 @@ url='https://github.com/samapriya/porder',

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

300707

0.75%

Lines of code

3991

0.76%