updates for tethys 4.3

.gitignore

@@ -7,6 +7,5 @@
 *.db
 *.sqlite
 *.DS_Store
-*.json
 .idea/
 services.yml

install.yml

@@ -1,7 +1,5 @@
 # This file should be committed to your app code.
-version: 1.1
-# This should be greater or equal to your tethys-platform in your environment
-tethys_version: ">=4.0.0"
+version: 1.0
 # This should match the app - package name in your setup.py
 name: dam_inventory
 
@@ -10,14 +8,8 @@ requirements:
   skip: false
   conda:
     channels:
-      - conda-forge
     packages:
-      - sqlalchemy<2
-      - psycopg2
-      - plotly
 
   pip:
 
-  npm:
-
 post:

setup.py

@@ -1,18 +1,17 @@
 from setuptools import setup, find_namespace_packages
-from tethys_apps.app_installation import find_all_resource_files
-from tethys_apps.base.app_base import TethysAppBase
+from tethys_apps.app_installation import find_resource_files
 
 # -- Apps Definition -- #
 app_package = 'dam_inventory'
-release_package = f'{TethysAppBase.package_namespace}-{app_package}'
+release_package = 'tethysapp-' + app_package
 
 # -- Python Dependencies -- #
 dependencies = []
 
 # -- Get Resource File -- #
-resource_files = find_all_resource_files(
-    app_package, TethysAppBase.package_namespace
-)
+resource_files = find_resource_files('tethysapp/' + app_package + '/templates', 'tethysapp/' + app_package)
+resource_files += find_resource_files('tethysapp/' + app_package + '/public', 'tethysapp/' + app_package)
+
 
 setup(
     name=release_package,
@@ -29,4 +28,4 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=dependencies,
-)
+)

tethysapp/dam_inventory/__init__.py

@@ -1 +1 @@
-# Included for native namespace package support
+# Included for native namespace package support

tethysapp/dam_inventory/app.py

@@ -1,12 +1,13 @@
+from tethys_sdk.base import TethysAppBase, url_map_maker
 from tethys_sdk.app_settings import CustomSetting, PersistentStoreDatabaseSetting
-from tethys_sdk.base import TethysAppBase
 from tethys_sdk.permissions import Permission, PermissionGroup
 
 
-class App(TethysAppBase):
+class DamInventory(TethysAppBase):
     """
     Tethys app class for Dam Inventory.
     """
+
     name = 'Dam Inventory'
     description = ''
     package = 'dam_inventory'  # WARNING: Do not change this value
@@ -30,6 +31,7 @@ def custom_settings(self):
                 required=False
             ),
         )
+
         return custom_settings
 
     def persistent_store_settings(self):
@@ -64,3 +66,19 @@ def permissions(self):
         permissions = (admin,)
 
         return permissions
+
+    @classmethod
+    def pre_delete_user_workspace(cls, user):
+        from .model import Dam
+        Session = cls.get_persistent_store_database('primary_db', as_sessionmaker=True)
+        session = Session()
+
+        # Delete all hydrographs connected to dams created by user
+        dams = session.query(Dam).filter(Dam.user_id == user.id)
+
+        for dam in dams:
+            if dam.hydrograph:
+                session.delete(dam.hydrograph)
+
+        session.commit()
+        session.close()