diff options
| author | Muriithi Frederick Muriuki | 2021-07-30 06:11:57 +0300 |
|---|---|---|
| committer | Muriithi Frederick Muriuki | 2021-07-30 06:11:57 +0300 |
| commit | 75ba10b9f7e8c5c7fabbd0f4134a1475cc180ae1 (patch) | |
| tree | f6ff2fd64cd288d75af4900cb7b2cd984f598ce0 /gn3/db/__init__.py | |
| parent | 77312535e643e4c8fecd7c20b3381996808dea11 (diff) | |
| parent | 00278bc237c90b4ac276171a32bbe57e056644b6 (diff) | |
| download | genenetwork3-75ba10b9f7e8c5c7fabbd0f4134a1475cc180ae1.tar.gz | |
Merge branch 'main' of github.com:genenetwork/genenetwork3 into heatmap_decompose_db_retrieval
Issue:
https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi
Fix merge conflicts in:
* gn3/db/traits.py
* tests/unit/db/test_traits.py
Diffstat (limited to 'gn3/db/__init__.py')
| -rw-r--r-- | gn3/db/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gn3/db/__init__.py b/gn3/db/__init__.py index 5ab9f3c..149a344 100644 --- a/gn3/db/__init__.py +++ b/gn3/db/__init__.py @@ -1,7 +1,7 @@ # pylint: disable=[R0902, R0903] """Module that exposes common db operations""" from dataclasses import asdict, astuple -from typing import Any, Dict, List, Optional, Generator, Union +from typing import Any, Dict, List, Optional, Generator, Tuple, Union from typing_extensions import Protocol from gn3.db.metadata_audit import MetadataAudit |