deriva 1.7.10__py3-none-any.whl → 1.7.12__py3-none-any.whl

deriva/transfer/backup/deriva_backup_cli.py

@@ -25,6 +25,11 @@ class DerivaBackupCLI(DerivaDownloadCLI):
                                           "references to asset files in the bag's \"fetch.txt\" file.")
         self.parser.add_argument("--bag-archiver", choices=['zip', 'tgz', 'bz2'],
                                  help="Format for compressed bag output.")
+        self.parser.add_argument("--ignore-acl", action="store_true",
+                                     help="If no ACL is present in the catalog schema, which may mean the user is not "
+                                          "the catalog owner, proceed anyway. WARNING: this will result in the backup "
+                                          "process running under whatever permissions the user possesses, which may be "
+                                          "limited enough to result in incomplete schema, incomplete data, or both.")
         self.parser.add_argument("--exclude-data", default=list(),
                                  type=lambda s: [item.strip() for item in s.split(',')],
                                  metavar="<schema>, <schema:table>, ...",

deriva/transfer/upload/deriva_upload.py

@@ -695,6 +695,16 @@ class DerivaUpload(object):
         # 6. Perform the Hatrac upload
         self._getFileHatracMetadata(asset_mapping)
         hatrac_options = asset_mapping.get("hatrac_options", {})
+        v = hatrac_options.get("chunk_size")
+        try:
+            chunk_size = int(v) if v not in (None, "") else DEFAULT_CHUNK_SIZE
+        except (TypeError, ValueError):
+            chunk_size = DEFAULT_CHUNK_SIZE
+        if chunk_size <= 0:
+            chunk_size = DEFAULT_CHUNK_SIZE
+            logger.warning(
+                "Specified chunk_size must be a positive integer (> 0) - falling back to default chunk size: %d." %
+                DEFAULT_CHUNK_SIZE)
         file_size = self.metadata["file_size"]
         versioned_uri = \
             self._hatracUpload(self.metadata["URI"],
@@ -704,8 +714,10 @@ class DerivaUpload(object):
                                content_type=self.guessContentType(file_path),
                                content_disposition=self.metadata.get("content-disposition"),
                                chunked=True if (file_size > DEFAULT_CHUNK_SIZE or file_size == 0) else False,
+                               chunk_size=chunk_size,
                                create_parents=stob(hatrac_options.get("create_parents", True)),
                                allow_versioning=stob(hatrac_options.get("allow_versioning", True)),
+                               force=stob(hatrac_options.get("force", False)),
                                callback=callback)
         logger.debug("Hatrac upload successful. Result object URI: %s" % versioned_uri)
         versioned_uris = True
@@ -942,9 +954,11 @@ class DerivaUpload(object):
                       content_type=None,
                       content_disposition=None,
                       chunked=True,
+                      chunk_size=DEFAULT_CHUNK_SIZE,
                       create_parents=True,
                       allow_versioning=True,
-                      callback=None):
+                      callback=None,
+                      force=False):
 
         # check if there is already an in-progress transfer for this file,
         # and if so, that the local file has not been modified since the original upload job was created
@@ -979,10 +993,12 @@ class DerivaUpload(object):
                                       content_type=content_type,
                                       content_disposition=content_disposition,
                                       chunked=chunked,
+                                      chunk_size=chunk_size,
                                       create_parents=create_parents,
                                       allow_versioning=allow_versioning,
                                       callback=callback,
-                                      cancel_job_on_error=False)
+                                      cancel_job_on_error=False,
+                                      force=force)
 
     def _get_catalog_table_columns(self, table):
         table_columns = set()

{deriva-1.7.10.dist-info → deriva-1.7.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deriva
-Version: 1.7.10
+Version: 1.7.12
 Summary: Python APIs and CLIs (Command-Line Interfaces) for the DERIVA platform.
 Home-page: https://github.com/informatics-isi-edu/deriva-py
 Author: USC Information Sciences Institute, Informatics Systems Research Division
@@ -15,11 +15,12 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.8, <4
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -28,7 +29,7 @@ Requires-Dist: requests
 Requires-Dist: pika
 Requires-Dist: urllib3<3,>=1.26.20
 Requires-Dist: portalocker>=1.2.1
-Requires-Dist: bdbag>=1.7.5
+Requires-Dist: bdbag>=1.8.0
 Requires-Dist: globus_sdk<4,>=3
 Requires-Dist: fair-research-login>=0.3.1
 Requires-Dist: fair-identifiers-client>=0.5.1

{deriva-1.7.10.dist-info → deriva-1.7.12.dist-info}/RECORD

@@ -8,17 +8,17 @@ deriva/config/dump_catalog_annotations.py,sha256=QzaWDLfWIAQ0eWVV11zeceWgwDBOYIe
 deriva/config/rollback_annotation.py,sha256=vqrIcen-KZX8LDpu2OVNivzIHpQoQgWkZAChZJctvtk,3015
 deriva/config/examples/group_owner_policy.json,sha256=8v3GWM1F_BWnYD9x_f6Eo4kBDvyy8g7mRqujfoEKLNc,2408
 deriva/config/examples/self_serve_policy.json,sha256=pW-cqWz4rJNNXwY4eVZFkQ8gKCHclC9yDa22ylfcDqY,1676
-deriva/core/__init__.py,sha256=2YJow_azmav6XbSDKH_fIO7or9_VyHdN1Od8_H-T964,4976
+deriva/core/__init__.py,sha256=eknMCmzhKiL-URSE8NKY6-D1OLP0oaFZKtiOjEeH3XI,4976
 deriva/core/annotation.py,sha256=PkAkPkxX1brQsb8_drR1Qj5QjQA5mjkpXhkq9NuZ1g8,13432
 deriva/core/base_cli.py,sha256=78Ilf3_f2xREQb3IIj6q0jwWAiXSObZszG0JURs36lA,2902
-deriva/core/catalog_cli.py,sha256=CwfTf7C81SpU1J_aPsWiIbPOBAyekkIh384KUivq5H8,23550
+deriva/core/catalog_cli.py,sha256=2Hq0yVVYtH7wSkGyXTvDjSJ8hwGfAMk7Z6X3JnwcKDA,23390
 deriva/core/datapath.py,sha256=h9WzLipAYctppoiZehyDNJdFpCnbU9-z-AWVD80z2Pk,90525
 deriva/core/deriva_binding.py,sha256=6yGXIbnayDtb9LU-JVK43zk02-aQwshrKiaLi1pru-8,13086
 deriva/core/deriva_server.py,sha256=nsW3gwg1sIaHl3BTf-nL41AkSj3dEpcEBlatvjvN8CQ,200
-deriva/core/ermrest_catalog.py,sha256=2mShQgo35DIQ-0UOEqu2VgCDTE3sUrQSWVDm1jW_tQ8,55547
-deriva/core/ermrest_model.py,sha256=oydtO6IU54ihjWQXcq0nfCyqAFJSW2FI9Z_0FjU7Uk0,124936
-deriva/core/hatrac_cli.py,sha256=l9QmneLRHSMiG_z9S83ea0QGVhTS3Wq1KGPEKEDpecM,14522
-deriva/core/hatrac_store.py,sha256=NcVuO4h4hswbEAct8tTKZ1pNtXBn74Nn9TelKN_jr8Q,22323
+deriva/core/ermrest_catalog.py,sha256=-iCYwuzO55HmDLB-BYGfQWDdqKTS4mYAfUlrBmq0KmY,55557
+deriva/core/ermrest_model.py,sha256=sgg9PF-Y1jg-2KUrM9WgpR3A0O8KcQ_wGs0_KG38ckM,128196
+deriva/core/hatrac_cli.py,sha256=G4iDQe7h45UCmd1uM6c1UpgLSu0lKiqUhm-OFirCFCY,15934
+deriva/core/hatrac_store.py,sha256=k783qeX3Wo1285ncN6Mr_Hbn9cSfmEDhSpQGF3dCm_M,24637
 deriva/core/mmo.py,sha256=dcB8akgsqbYMi22ClbVpOKVL6so8FjSDjSb6gP4_jFo,17852
 deriva/core/polling_ermrest_catalog.py,sha256=KsjiFqPQaHWnJZCVF5i77sdzfubqZHgMBbQ1p8V8D3s,10351
 deriva/core/schemas/app_links.schema.json,sha256=AxrkC2scxomM6N7jyjtdYA73BbZzPrmuqU8PYWe7okI,954
@@ -44,8 +44,9 @@ deriva/core/schemas/visible_columns.schema.json,sha256=-JKqvhfKT-5btKBtzKn3p6EgY
 deriva/core/schemas/visible_foreign_keys.schema.json,sha256=K-oa2qzj5EbmJCEyN6mN3vubblHENFxxbZEeQfFV_QQ,3364
 deriva/core/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva/core/utils/__init__.py,sha256=XSbGaWe44hebxYvoh5huFzZkMY6TSKPOCRSjUOvaY70,124
-deriva/core/utils/core_utils.py,sha256=bMPVBG0W5-OAPcY7rXYlIfPAofmN1We6h1uyzXYnR9s,19821
-deriva/core/utils/globus_auth_utils.py,sha256=x5Dh4PlAMIKTm4b8nKUeuCMSFn7NMgj_NqtmnS_FM0I,57366
+deriva/core/utils/core_utils.py,sha256=rSidaI2oY_eAO6MT68QAK9eJTLpibcaPni5Rg5axYuU,29569
+deriva/core/utils/credenza_auth_utils.py,sha256=0LlZeYgivBiWGAnKie7qHtSNdOH13frPyd0DYDDkkBo,25705
+deriva/core/utils/globus_auth_utils.py,sha256=fzMFvNIkaaCHNMB6xXPXWCeo0DblLrVVbek6MzB9EY0,57184
 deriva/core/utils/hash_utils.py,sha256=JqUYVB3jXusCQYX9fkKmweUKBC0WQi8ZI2N8m-uKygQ,2299
 deriva/core/utils/mime_utils.py,sha256=ZT7pMjY2kQWBsgsGC3jY6kjfygdsIyiYW3BKNw_pPyg,1128
 deriva/core/utils/version_utils.py,sha256=HWNUQAZrPXu0oGjhG6gMNm3kWtfa3nR50vfH2uQxBA0,2954
@@ -56,8 +57,8 @@ deriva/seo/sitemap_cli.py,sha256=miCqRfpSj5Dx5BfJGSd8Pi2e4OOQjotDzP_JubukhCM,265
 deriva/transfer/__init__.py,sha256=VRxmElD5SIOGzrB1biUU8bP3_iXPMvJuau-9alU5oy0,1266
 deriva/transfer/backup/__init__.py,sha256=vxsZiDLMTJQPybXT89G-07GsUoLhnItTCbLdXcDSyeA,465
 deriva/transfer/backup/__main__.py,sha256=dT12--8C6sKGEtMhsYuy013ebXKpVnBJfhcQNlVtv6Y,361
-deriva/transfer/backup/deriva_backup.py,sha256=IO9Tmzx6jHfUCkP-41nSsAeOFLn9T-0HwQcpRLpM_zs,5228
-deriva/transfer/backup/deriva_backup_cli.py,sha256=T0tvPKWniRinMQt0qG7FI8AoK3GgtlT6EyBZmZCAjL8,2157
+deriva/transfer/backup/deriva_backup.py,sha256=CgMvi0HwQohf2F7bvPk3LF2sFs3AS8ikvNSStF2VETk,5223
+deriva/transfer/backup/deriva_backup_cli.py,sha256=GcutL_3JjzYMHMQ02pckLby_37b8rR48CXHjeYrPq60,2706
 deriva/transfer/download/__init__.py,sha256=Pr7Zud4AFsIWwopTxeC_pupslgCG_lzycO9w9Xyh88Q,350
 deriva/transfer/download/__main__.py,sha256=YUg7AZ07t_xaOgtfJnU_l1nkEHCCPR8sU5X-l1An6SY,363
 deriva/transfer/download/deriva_download.py,sha256=ulFrHHEDj3oJA2pAo7MGvGyDF9rA3l8yCUoK3FMvHEk,17100
@@ -87,7 +88,7 @@ deriva/transfer/restore/deriva_restore.py,sha256=s0h7cXit2USSdjrIfrj0dr7BJ0rrHHM
 deriva/transfer/restore/deriva_restore_cli.py,sha256=2ViZ1Lyl5ndXPKeJFCHHGnwzkg3DfHhTuRa_bN7eJm8,5603
 deriva/transfer/upload/__init__.py,sha256=4mlc_iUX-v7SpXzlCZmhxQtSiW5JeDGb2FX7bb1E6tY,304
 deriva/transfer/upload/__main__.py,sha256=hqnXtGpRqPthwpO6uvrnf_TQm7McheeyOt960hStSMY,340
-deriva/transfer/upload/deriva_upload.py,sha256=CFWhvsMl9Ndw6QJYvQoOsErwQuF1wOpgqGju8G0QgTQ,61708
+deriva/transfer/upload/deriva_upload.py,sha256=UPwg8qt_JJkCjpgN4JpLED0ITallTsCgcR30rOLbOAM,62514
 deriva/transfer/upload/deriva_upload_cli.py,sha256=-Q6xgiYabQziTQcMQdGNDAv-eLxCCHO-BCSo4umbDE4,5082
 deriva/transfer/upload/processors/__init__.py,sha256=sMM5xdJ82UIRdB1lGMKk7ft0BgtjS2oJ0sI4SQSqiIU,2481
 deriva/transfer/upload/processors/archive_processor.py,sha256=ID0lDwDn4vPe5nbxy6m28Ssj_TsZpK4df2xRrM6nJRQ,2015
@@ -97,20 +98,9 @@ deriva/transfer/upload/processors/metadata_update_processor.py,sha256=Hgu5huZf7Z
 deriva/transfer/upload/processors/rename_processor.py,sha256=UQ-JQuQgyYCGT-fU9kHA53kPdQ20kt-2Bb486od7B14,2423
 deriva/transfer/upload/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva/utils/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
-deriva-1.7.10.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-tests/deriva/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/deriva/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/deriva/core/test_datapath.py,sha256=ft7qDp9peomnhtREry5et4QDO4RyfCCBSE6YnNDNYe8,40225
-tests/deriva/core/test_ermrest_model.py,sha256=tmWmAgXTcLBueY4iUS14uq-b1SjgKMaFGt2lw9mYvbg,34330
-tests/deriva/core/mmo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/deriva/core/mmo/base.py,sha256=3iLqUDNdiJaERB-8-G-5NEvkJr9fz0YUMvPxl5hMINE,9356
-tests/deriva/core/mmo/test_mmo_drop.py,sha256=R_yl-PIHGx-3kchT5TH8O9TJktepWjgs6hHISOc6d2k,8930
-tests/deriva/core/mmo/test_mmo_find.py,sha256=PcUN76sik68B3XKg0G3wHVpKcPEld_6RtbxeGzkrMQ8,4172
-tests/deriva/core/mmo/test_mmo_prune.py,sha256=4pYtYL8g1BgadlewNPVpVA5lT_gV6SPTDYf04ZKzBTA,6851
-tests/deriva/core/mmo/test_mmo_rename.py,sha256=4oSR1G3Od701Ss3AnolI1Z7CbMxKuQF2uSr2_IcoR6s,8512
-tests/deriva/core/mmo/test_mmo_replace.py,sha256=w-66LWyiQ_ajC7Ipmhc4kAKwIloPdQELeUPsvelTdX8,8439
-deriva-1.7.10.dist-info/METADATA,sha256=OrMw19lEt6tH9VyJq5a8wL4WpeIu-Wr1a8rjrJLKNdk,1891
-deriva-1.7.10.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-deriva-1.7.10.dist-info/entry_points.txt,sha256=HmYCHlgbjYQ_aZX_j4_4tApH4tDTbYtS66jKlfytbn8,850
-deriva-1.7.10.dist-info/top_level.txt,sha256=_LHDie5-O53wFlexfrxjewpVkf04oydf3CqX5h75DXE,13
-deriva-1.7.10.dist-info/RECORD,,
+deriva-1.7.12.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+deriva-1.7.12.dist-info/METADATA,sha256=OTDbjqhWLZwSiWGwo9aTcV_Alp9vvYqbN4repIpNo9w,1944
+deriva-1.7.12.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+deriva-1.7.12.dist-info/entry_points.txt,sha256=uS-e7FxTP7lVm-QJdq_ErytmAbXvlRkEvrjab33ctRE,922
+deriva-1.7.12.dist-info/top_level.txt,sha256=OoTnCAuRnf-pPKMre5HA7mgLMIPl_2-lAWoZ63y74-U,7
+deriva-1.7.12.dist-info/RECORD,,

{deriva-1.7.10.dist-info → deriva-1.7.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{deriva-1.7.10.dist-info → deriva-1.7.12.dist-info}/entry_points.txt

@@ -6,6 +6,7 @@ deriva-annotation-rollback = deriva.config.rollback_annotation:main
 deriva-annotation-validate = deriva.config.annotation_validate:main
 deriva-backup-cli = deriva.transfer.backup.__main__:main
 deriva-catalog-cli = deriva.core.catalog_cli:main
+deriva-credenza-auth-utils = deriva.core.utils.credenza_auth_utils:main
 deriva-download-cli = deriva.transfer.download.__main__:main
 deriva-export-cli = deriva.transfer.download.deriva_export:main
 deriva-globus-auth-utils = deriva.core.utils.globus_auth_utils:main

{deriva-1.7.10.dist-info → deriva-1.7.12.dist-info}/top_level.txt

@@ -1,2 +1 @@
 deriva
-tests

tests/deriva/core/mmo/base.py

@@ -1,300 +0,0 @@
-"""Base class for MMO test cases.
-"""
-import logging
-import os
-import unittest
-
-from deriva.core import DerivaServer, ErmrestCatalog, get_credential
-from deriva.core.ermrest_model import Schema, Table, Column, Key, ForeignKey, tag, builtin_types
-
-logger = logging.getLogger(__name__)
-logger.setLevel(os.getenv('DERIVA_PY_TEST_LOGLEVEL', default=logging.WARNING))
-ermrest_hostname = os.getenv('DERIVA_PY_TEST_HOSTNAME')
-ermrest_catalog_id = os.getenv('DERIVA_PY_TEST_CATALOG')
-catalog = None
-
-# baseline annotation doc for `dept` table
-dept_annotations = {
-    tag.visible_columns: {
-        "compact": [
-            ["dept_schema", "dept_RID_key"],
-            ["dept_schema", "dept_dept_no_key"],
-            "name"
-        ],
-        "detailed": [
-            "RID",
-            "RCT",
-            {
-                "source": "RMT",
-                "markdown_name": "Last Modified Time"
-            },
-            "dept_no",
-            "name",
-            {
-                "source": "street_address",
-                "markdown_name": "Number and Street Name"
-            },
-            "postal_code",
-            {
-                "sourcekey": "head_count",
-                "markdown_name": "Head Count"
-            },
-            {
-                "display": {
-                    "wait_for": [
-                        "personnel"
-                    ],
-                    "template_engine": "handlebars",
-                    "markdown_pattern": "{{#each personnel}}{{{this.values.name}}}{{#unless @last}}, {{/unless}}{{/each}}."
-                },
-                "markdown_name": "Personnel"
-            }
-        ]
-    },
-    tag.visible_foreign_keys: {
-        "*": [
-            [
-                "person_schema",
-                "person_dept_fkey"
-            ]
-        ]
-    },
-    tag.source_definitions: {
-        "columns": [
-            "dept_no",
-            "name",
-            "RID",
-            "country"
-        ],
-        "sources": {
-            "personnel": {
-                "source": [
-                    {
-                        "inbound": [
-                            "person_schema",
-                            "person_dept_fkey"
-                        ]
-                    },
-                    "name"
-                ]
-            },
-            "head_count": {
-                "source": [
-                    {
-                        "inbound": [
-                            "person_schema",
-                            "person_dept_fkey"
-                        ]
-                    },
-                    "RID"
-                ],
-                "entity": False,
-                "aggregate": "cnt_d"
-            }
-        }
-    }
-}
-
-# baseline annotation doc for `person` table
-person_annotations = {
-    tag.visible_columns: {
-        "compact": [
-            ["person_schema", "person_RID_key"],
-            "name"
-        ],
-        "detailed": [
-            "RID",
-            "name",
-            ["person_schema", "person_dept_fkey"],
-            {
-                "markdown_name": "Department Name",
-                "source": [
-                    {
-                        "outbound": [
-                            "person_schema",
-                            "person_dept_fkey"
-                        ]
-                    },
-                    "name"
-                ],
-                "entity": False
-            },
-            {
-                "sourcekey": "dept_size",
-                "markdown_name": "Department Size"
-            },
-            {
-                "sourcekey": "dept_city",
-                "markdown_name": "City"
-            },
-            {
-                "markdown_name": "State or Province",
-                "source": [
-                    {
-                        "outbound": [
-                            "person_schema",
-                            "person_dept_fkey"
-                        ]
-                    },
-                    "state"
-                ],
-                "entity": False
-            },
-        ]
-    },
-    tag.source_definitions: {
-        "columns": [
-            "RID",
-            "name",
-            "dept"
-        ],
-        "fkeys": [
-            ["person_schema", "person_dept_fkey"]
-        ],
-        "sources": {
-            "dept_size": {
-                "source": [
-                    {
-                        "outbound": [
-                            "person_schema",
-                            "person_dept_fkey"
-                        ]
-                    },
-                    {
-                        "inbound": [
-                            "person_schema",
-                            "person_dept_fkey"
-                        ]
-                    },
-                    "RID"
-                ],
-                "entity": False,
-                "aggregate": "cnt_d"
-            },
-            "dept_city":             {
-                "markdown_name": "City",
-                "source": [
-                    {
-                        "outbound": [
-                            "person_schema",
-                            "person_dept_fkey"
-                        ]
-                    },
-                    "city"
-                ],
-                "entity": False
-            }
-        },
-        "search-box": {
-            "or": [
-                {
-                    "source": "last_name"
-                }
-            ]
-        }
-    }
-}
-
-
-@unittest.skipUnless(ermrest_hostname, 'ERMrest hostname not defined.')
-class BaseMMOTestCase (unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        BaseMMOTestCase.setUpCatalog()
-
-    @classmethod
-    def setUpCatalog(cls):
-        global catalog
-
-        # create catalog
-        server = DerivaServer('https', ermrest_hostname, credentials=get_credential(ermrest_hostname))
-        if ermrest_catalog_id:
-            logger.debug(f'Connecting to {ermrest_hostname}/ermrest/catalog/{ermrest_catalog_id}')
-            catalog = server.connect_ermrest(ermrest_catalog_id)
-        else:
-            catalog = server.create_ermrest_catalog()
-            logger.debug(f'Created {ermrest_hostname}/ermrest/catalog/{catalog.catalog_id}')
-
-        # get the  model
-        model = catalog.getCatalogModel()
-
-        # drop all schemas (except 'public')
-        for sname in [sname for sname in model.schemas if sname != 'public']:
-            model.schemas[sname].drop(cascade=True)
-
-        # recreate schemas
-        for sname in ["dept_schema", "person_schema"]:
-            model.create_schema(Schema.define(sname))
-
-        # create `dept` table
-        model.schemas["dept_schema"].create_table(
-            Table.define(
-                'dept',
-                column_defs=[
-                    Column.define('dept_no', builtin_types.int8),
-                    Column.define('name', builtin_types.text),
-                    Column.define('street_address', builtin_types.text),
-                    Column.define('city', builtin_types.text),
-                    Column.define('state', builtin_types.text),
-                    Column.define('country', builtin_types.text),
-                    Column.define('postal_code', builtin_types.int8)
-                ],
-                key_defs=[
-                    Key.define(['dept_no'])
-                ],
-                annotations=dept_annotations
-            )
-        )
-
-        # create `person` table
-        model.schemas["person_schema"].create_table(
-            Table.define(
-                'person',
-                column_defs=[
-                    Column.define('name', builtin_types.text),
-                    Column.define('dept', builtin_types.int8),
-                    Column.define('last_name', builtin_types.text)
-                ],
-                fkey_defs=[
-                    ForeignKey.define(['dept'], "dept_schema", 'dept', ['dept_no'])
-                ],
-                annotations=person_annotations
-            )
-        )
-
-        # populate for good measure (though not necessary for current set of tests)
-        pbuilder = catalog.getPathBuilder()
-
-        pbuilder.dept_schema.dept.insert([
-            {'dept_no': 1, 'name': 'Dept A', 'street_address': '123 Main St', 'city': 'Anywhere', 'state': 'CA', 'country': 'US', 'postal_code': 98765},
-            {'dept_no': 2, 'name': 'Dept B', 'street_address': '777 Oak Ave', 'city': 'Somewhere', 'state': 'NY', 'country': 'US', 'postal_code': 12345}
-        ])
-
-        pbuilder.person_schema.person.insert([
-            {'name': 'John', 'dept': 1},
-            {'name': 'Helena', 'dept': 1},
-            {'name': 'Ben', 'dept': 1},
-            {'name': 'Sonia', 'dept': 2},
-            {'name': 'Rafael', 'dept': 2},
-        ])
-
-    @classmethod
-    def tearDownClass(cls):
-        BaseMMOTestCase.tearDownCatalog()
-
-    @classmethod
-    def tearDownCatalog(cls):
-        global catalog
-        if not ermrest_catalog_id and isinstance(catalog, ErmrestCatalog) and int(catalog.catalog_id) > 1000:
-            # note: the '... > 1000' clause is intended to safeguard against accidental deletion of production catalogs in the usual (lower) range
-            catalog.delete_ermrest_catalog(really=True)
-        catalog = None
-
-    def setUp(self):
-        # reset annotations to baseline
-        assert isinstance(catalog, ErmrestCatalog)
-        self.model = catalog.getCatalogModel()
-
-    def tearDown(self):
-        pass