Merge branch '1.0.6' into develop

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "schemas"]
-	path = LDMP/schemas
-	url = https://github.com/ConservationInternational/trends.earth-schemas.git

LDMP/calculate_lc.py

@@ -35,7 +35,7 @@
 from LDMP.worker import AbstractWorker, StartWorker
 from LDMP.gui.DlgCalculateLC import Ui_DlgCalculateLC
 
-from LDMP.schemas.schemas import BandInfo, BandInfoSchema
+from te_schemas.schemas import BandInfo, BandInfoSchema
 
 
 class LandCoverChangeWorker(AbstractWorker):

LDMP/calculate_ldn.py

@@ -43,9 +43,10 @@
 from LDMP.layers import (add_layer, create_local_json_metadata, get_band_infos,
     delete_layer_by_filename)
 
-from LDMP.schemas.schemas import AreaOfInterest, BandInfo, BandInfoSchema
-from LDMP.schemas.reporting import *
-from LDMP.schemas.land_cover import *
+from te_schemas.schemas import BandInfo, BandInfoSchema
+from te_schemas.schemas.schemas import AreaOfInterest, BandInfo, BandInfoSchema
+from te_schemas.schemas.reporting import *
+from te_schemas.schemas.land_cover import *
 
 from LDMP.gui.DlgCalculateOneStep import Ui_DlgCalculateOneStep
 from LDMP.gui.DlgCalculateLDNSummaryTableAdmin import Ui_DlgCalculateLDNSummaryTableAdmin
@@ -243,7 +244,7 @@ def btn_calculate(self):
                    'crs': self.aoi.get_crs_dst_wkt(),
                    'crosses_180th': crosses_180th,
                    'prod_traj_method': 'ndvi_trend',
-                   'ndvi_gee_dataset': 'users/geflanddegradation/toolbox_datasets/ndvi_modis_2001_2019',
+                   'ndvi_gee_dataset': self.datasets['NDVI']['MODIS (MOD13Q1, annual)']['GEE Dataset'],
                    'climate_gee_dataset': None,
                    'fl': .80,
                    'trans_matrix': self.lc_define_deg_tab.trans_matrix_get(),

LDMP/calculate_rest_biomass.py

@@ -41,7 +41,7 @@
 from LDMP.worker import AbstractWorker, StartWorker
 from LDMP.gui.DlgCalculateRestBiomassData import Ui_DlgCalculateRestBiomassData
 from LDMP.gui.DlgCalculateRestBiomassSummaryTable import Ui_DlgCalculateRestBiomassSummaryTable
-from LDMP.schemas.schemas import BandInfo, BandInfoSchema
+from te_schemas.schemas import BandInfo, BandInfoSchema
 from LDMP.summary import *
 
 

LDMP/calculate_soc.py

@@ -38,7 +38,7 @@
 from LDMP.worker import AbstractWorker, StartWorker
 from LDMP.gui.DlgCalculateSOC import Ui_DlgCalculateSOC
 
-from LDMP.schemas.schemas import BandInfo, BandInfoSchema
+from te_schemas.schemas import BandInfo, BandInfoSchema
 
 
 def remap(a, remap_list):

LDMP/calculate_tc.py

@@ -42,7 +42,7 @@
 from LDMP.worker import AbstractWorker, StartWorker
 from LDMP.gui.DlgCalculateTCData import Ui_DlgCalculateTCData
 from LDMP.gui.DlgCalculateTCSummaryTable import Ui_DlgCalculateTCSummaryTable
-from LDMP.schemas.schemas import BandInfo, BandInfoSchema
+from te_schemas.schemas import BandInfo, BandInfoSchema
 from LDMP.summary import *
 
 

LDMP/calculate_urban.py

@@ -38,7 +38,7 @@
 from LDMP.gui.DlgCalculateUrbanSummaryTable import Ui_DlgCalculateUrbanSummaryTable
 from LDMP.layers import get_band_infos, create_local_json_metadata, add_layer
 from LDMP.worker import AbstractWorker, StartWorker
-from LDMP.schemas.schemas import BandInfo, BandInfoSchema
+from te_schemas.schemas import BandInfo, BandInfoSchema
 from LDMP.summary import *
 
 

LDMP/data/scripts.json

@@ -1,14 +1,14 @@
 {
     "time-series": {
-        "script version": "1.0.5",
+        "script version": "1.0.6",
         "description": "Calculate time series."
     },
     "land-cover": {
-        "script version": "1.0.5",
+        "script version": "1.0.6",
         "description": "Calculate land cover change indicator."
     },
     "productivity": {
-        "script version": "1.0.5",
+        "script version": "1.0.6",
         "description": "Calculate productivity state, performance, and/or trajectory indicators.",
         "trajectory functions": {
             "NDVI trends": {
@@ -34,27 +34,27 @@
         }
     },
     "soil-organic-carbon": {
-        "script version": "1.0.5",
+        "script version": "1.0.6",
         "description": "Calculate soil organic carbon."
     },
     "sdg-sub-indicators": {
-        "script version": "1.0.5",
+        "script version": "1.0.6",
         "description": "Calculate all three SDG sub-indicators in one step."
     },
     "download-data": {
-        "script version": "1.0.5",
+        "script version": "1.0.6",
         "description": "Download data from Google Earth Engine assets."
     },
     "total-carbon": {
-        "script version": "1.0.5",
+        "script version": "1.0.6",
         "description": "Calculate total carbon in biomass (above and below ground)."
     },
     "urban-area": {
-        "script version": "1.0.5",
+        "script version": "1.0.6",
         "description": "Calculate urban area."
     },
     "restoration-biomass": {
-        "script version": "1.0.5",
+        "script version": "1.0.6",
         "description": "Calculate potential change in biomass with restoration."
     }
 }

LDMP/data_io.py

@@ -53,7 +53,7 @@
 from LDMP.gui.WidgetDataIOImportSelectRasterOutput import Ui_WidgetDataIOImportSelectRasterOutput
 from LDMP.gui.WidgetDataIOSelectTELayerExisting import Ui_WidgetDataIOSelectTELayerExisting
 from LDMP.gui.WidgetDataIOSelectTELayerImport import Ui_WidgetDataIOSelectTELayerImport
-from LDMP.schemas.schemas import BandInfo, BandInfoSchema
+from te_schemas.schemas import BandInfo, BandInfoSchema
 
 
 class RemapVectorWorker(AbstractWorker):

LDMP/jobs.py

@@ -42,7 +42,7 @@
 from LDMP.api import get_user_email, get_execution
 from LDMP.download import Download, check_hash_against_etag, DownloadError
 from LDMP.layers import add_layer
-from LDMP.schemas.schemas import LocalRaster, LocalRasterSchema
+from te_schemas.schemas import LocalRaster, LocalRasterSchema
 
 
 class tr_jobs(object):

LDMP/layers.py

@@ -36,7 +36,7 @@
 
 from LDMP import log
 
-from LDMP.schemas.schemas import LocalRaster, LocalRasterSchema
+from te_schemas.schemas import LocalRaster, LocalRasterSchema
 
 
 class tr_layers(object):

LDMP/metadata.txt

@@ -2,7 +2,7 @@
 name=trends.earth
 qgisMinimumVersion=3.10.3
 description=Analyze land change in support of sustainable land management, achieving the Land Degradation Neutrality (LDN) Sustainable Development Goal (SDG), and to support reporting to the Global Environment Facility (GEF) and United Nations Convention to Combat Desertification (UNCCD)
-version=1.0.5
+version=1.0.6
 author=Conservation International
 [email protected]
 
@@ -27,7 +27,13 @@ deprecated=False
 hasProcessingProvider=yes
 
 # Uncomment the following line and add your changelog:
-changelog=1.0.4 (June 30, 2021)
+changelog=1.0.6 (July 15, 2021)
+    - Remove trends.earth-schemas as a submodule and install through setup.py 
+      (much cleaner for version tracking, development, etc.)
+    - Fix bug in loading 2020 NDVI data in GEE code (asset name wasn't set 
+      right so 2020 wasn't loading)
+    - Various invoke tasks added to help with plugin development/release.
+  1.0.4 (June 30, 2021)
     - Add WorldPop and Gridded Population of the World version 4 (GPWv4) to the 
       datasets available through Trends.Earth
     - Update to allow access to ESA-CCI land cover through 2020

docs/source/conf.py

@@ -14,6 +14,7 @@
 import sys
 import os
 import sphinx_rtd_theme
+from datetime import date
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -47,7 +48,7 @@
 
 # General information about the project.
 project = u'Trends.Earth'
-copyright = u'2018, Conservation International'
+copyright = u'2017-{}, Conservation International'.format(date.today().year)
 
 locale_dirs = ['../i18n/']
 gettext_compact = False
@@ -57,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.5'
+version = '1.0.6'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.5'
+release = '1.0.6'
 
 rst_epilog = """
 .. |iconCalculator| image:: /static/common/icon-calculator.png

gee/download_data/configuration.json

@@ -1 +1 @@
-{"name": "Download data 1_0_5", "id": "30146738-5f55-46e8-918a-143304459266"}
+{"name": "Download data 1_0_6", "id": "2a25cc8f-c714-4233-a71c-5579c3c4bb2e"}

gee/download_data/requirements.txt

@@ -1,4 +1,4 @@
 earthengine-api==0.1.232
 rollbar==0.14.7
-git+git://github.com/conservationinternational/[email protected].5#egg=landdegradation
+git+https://github.com/conservationinternational/[email protected].6
 

gee/download_data/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ =  "1.0.5"
+__version__ =  "1.0.6"
 
 import sys
 import os

gee/land_cover/configuration.json

@@ -1 +1 @@
-{"name": "Land cover 1_0_5", "id": "7fa6c024-4d5b-4008-ae60-3d1aa73da767"}
+{"name": "Land cover 1_0_6", "id": "c47e25fa-c161-4da1-b32b-1e935e809d12"}

gee/land_cover/requirements.txt

@@ -1,3 +1,3 @@
 earthengine-api==0.1.232
 rollbar==0.14.7
-git+git://github.com/conservationinternational/[email protected].5#egg=landdegradation
+git+https://github.com/conservationinternational/[email protected].6

gee/land_cover/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ =  "1.0.5"
+__version__ =  "1.0.6"
 
 import sys
 import os

gee/landpks/configuration.json

@@ -1 +1 @@
-{"name": "LandPKS 1_0_5", "id": "28f228de-0bbb-41f2-9897-7f660e98332f"}
+{"name": "LandPKS 1_0_6", "id": "c47a22eb-fa64-42b4-84cd-eee5dc04162e"}

gee/landpks/landpks_landtrend_plot.ipynb

@@ -39,7 +39,7 @@
     "import pandas as pd\n",
     "\n",
     "from landdegradation.util import get_coords\n",
-    "from landdegradation.schemas.schemas import TimeSeries, TimeSeriesTable, TimeSeriesTableSchema\n",
+    "from te_schemas.schemas import TimeSeries, TimeSeriesTable, TimeSeriesTableSchema\n",
     "\n",
     "# The service account email address authorized by your Google contact.\n",
     "# Set up a service account as described in the README.\n",

gee/landpks/requirements.txt

@@ -1,8 +1,9 @@
-Pillow==7.2.0
+Pillow==8.3.1
 pandas==1.1.2
 numpy==1.19.0
 matplotlib==3.3.1
 matplotlib-scalebar==0.6.2
 earthengine-api==0.1.232
 rollbar==0.14.7
-git+git://github.com/conservationinternational/[email protected]#egg=landdegradation
+git+https://github.com/conservationinternational/[email protected]
+git+https://github.com/ConservationInternational/[email protected]

gee/landpks/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ =  "1.0.5"
+__version__ =  "1.0.6"
 
 import sys
 import os

gee/landpks/src/main.py

@@ -38,7 +38,7 @@
 
 import pandas as pd
 
-from landdegradation.schemas.schemas import Url, ImageryPNG, \
+from te_schemas.schemas import Url, ImageryPNG, \
         ImageryPNGSchema
 
 

gee/productivity/configuration.json

@@ -1 +1 @@
-{"name": "Productivity 1_0_5", "id": "c620d477-4143-41fe-9665-c82b453a7b6b"}
+{"name": "Productivity 1_0_6", "id": "603240ce-c2b3-469b-9825-ad7f5039a5e1"}

gee/productivity/requirements.txt

@@ -1,3 +1,4 @@
 earthengine-api==0.1.232
 rollbar==0.14.7
-git+git://github.com/conservationinternational/[email protected]#egg=landdegradation
+git+https://github.com/conservationinternational/[email protected]
+git+https://github.com/ConservationInternational/[email protected]

gee/productivity/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ =  "1.0.5"
+__version__ =  "1.0.6"
 
 import sys
 import os

gee/productivity/src/main.py

@@ -16,7 +16,7 @@
 from landdegradation.productivity import productivity_trajectory, \
     productivity_performance, productivity_state
 from landdegradation.download import download
-from landdegradation.schemas.schemas import CloudResultsSchema
+from te_schemas.schemas import CloudResultsSchema
 
 
 def run(params, logger):

gee/restoration/configuration.json

@@ -1 +1 @@
-{"name": "Restoration biomass 1_0_5", "id": "0f658972-3f62-400e-a6cf-5a78c1497326"}
+{"name": "Restoration biomass 1_0_6", "id": "9bc1c1bf-2a89-4150-b601-2d734ac25e77"}

gee/restoration/requirements.txt

@@ -1,4 +1,5 @@
 earthengine-api==0.1.232
 rollbar==0.14.7
-git+git://github.com/conservationinternational/[email protected]#egg=landdegradation
+git+https://github.com/conservationinternational/[email protected]
+git+https://github.com/ConservationInternational/[email protected]
 

gee/restoration/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ =  "1.0.5"
+__version__ =  "1.0.6"
 
 import sys
 import os

gee/restoration/src/main.py

@@ -13,7 +13,7 @@
 import ee
 
 from landdegradation.util import TEImage
-from landdegradation.schemas.schemas import BandInfo
+from te_schemas.schemas import BandInfo
 
 def restoration_carbon(rest_type, length_yr, crs, geojsons, EXECUTION_ID,
                        logger):

gee/sdg_sub_indicators/configuration.json

@@ -1 +1 @@
-{"name": "SDG sub-indicators 1_0_5", "id": "08f45c76-5175-4f88-907b-558245537f22"}
+{"name": "SDG sub-indicators 1_0_6", "id": "1631041b-0dae-4216-940f-e9d0a60c5e7b"}

gee/sdg_sub_indicators/requirements.txt

@@ -1,4 +1,5 @@
 earthengine-api==0.1.232
 rollbar==0.14.7
-git+git://github.com/conservationinternational/[email protected]#egg=landdegradation
+git+https://github.com/conservationinternational/[email protected]
+git+https://github.com/ConservationInternational/[email protected]
 

gee/sdg_sub_indicators/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ =  "1.0.5"
+__version__ =  "1.0.6"
 
 import sys
 import os

gee/sdg_sub_indicators/src/main.py

@@ -18,7 +18,7 @@
 from landdegradation.land_cover import land_cover
 from landdegradation.soc import soc
 from landdegradation.download import download
-from landdegradation.schemas.schemas import CloudResultsSchema
+from te_schemas.schemas import CloudResultsSchema
 
 
 def run(params, logger):

gee/soil_organic_carbon/configuration.json

@@ -1 +1 @@
-{"name": "Soil organic carbon 1_0_5", "id": "965cd7e6-28ec-4a73-ba25-91de6e87fd78"}
+{"name": "Soil organic carbon 1_0_6", "id": "4c933c7f-9f34-48fd-bd97-5a13a57a872c"}

gee/soil_organic_carbon/requirements.txt

@@ -1,4 +1,4 @@
 earthengine-api==0.1.232
 rollbar==0.14.7
-git+git://github.com/conservationinternational/[email protected].5#egg=landdegradation
+git+https://github.com/conservationinternational/[email protected].6
 

gee/soil_organic_carbon/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ =  "1.0.5"
+__version__ =  "1.0.6"
 
 import sys
 import os

gee/time_series/configuration.json

@@ -1 +1 @@
-{"name": "Time series 1_0_5", "id": "071885a5-f20b-4045-a895-1268fb22a6d8"}
+{"name": "Time series 1_0_6", "id": "e9333331-34fb-436d-8f4c-88b19c2b3bf5"}

gee/time_series/requirements.txt

@@ -1,4 +1,3 @@
 earthengine-api==0.1.232
 rollbar==0.14.7
-git+git://github.com/conservationinternational/[email protected]#egg=landdegradation
-
+git+https://github.com/conservationinternational/[email protected]

gee/time_series/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ =  "1.0.5"
+__version__ =  "1.0.6"
 
 import sys
 import os