Merge pull request #384 from ianbakst/rename_dataset

Rename dataset
Datatamer · May 28, 2020 · e558bc3 · e558bc3
2 parents 16f3024 + ca7099d
commit e558bc3
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 22 deletions.
diff --git a/docs/beta.md b/docs/beta.md
@@ -7,7 +7,7 @@
 
   * [Attributes](beta/attributes)
   * [Auth](beta/auth)
-  * [Dataset](beta/datasets)
+  * [Dataset](beta/dataset)
   * [Instance](beta/instance)
   * [Mastering](beta/mastering)
   * [Project](beta/project)

diff --git a/docs/beta/dataset.md b/docs/beta/dataset.md
@@ -0,0 +1,5 @@
+# Dataset
+
+  * [Dataset](/beta/dataset/dataset)
+  * [Record](/beta/dataset/record)
+  * [Dataframe](/beta/dataset/dataframe)
diff --git a/docs/beta/datasets/dataframe.rst → docs/beta/dataset/dataframe.rst b/docs/beta/datasets/dataframe.rst → docs/beta/dataset/dataframe.rst
diff --git a/docs/beta/datasets/dataset.rst → docs/beta/dataset/dataset.rst b/docs/beta/datasets/dataset.rst → docs/beta/dataset/dataset.rst
diff --git a/docs/beta/datasets/record.rst → docs/beta/dataset/record.rst b/docs/beta/datasets/record.rst → docs/beta/dataset/record.rst
diff --git a/docs/beta/datasets.md b/docs/beta/datasets.md
diff --git a/tamr_client/__init__.py b/tamr_client/__init__.py
@@ -37,8 +37,16 @@
 import tamr_client.session as session
 
 # datasets
-from tamr_client.datasets.dataset import Dataset, DatasetNotFound
-import tamr_client.datasets.dataset as dataset
+from tamr_client.dataset import Dataset, DatasetNotFound
+import tamr_client.dataset as dataset
+
+# records
+from tamr_client.dataset.record import PrimaryKeyNotFound
+from tamr_client.dataset import record
+
+# dataframe
+from tamr_client.dataset.dataframe import AmbiguousPrimaryKey
+from tamr_client.dataset import dataframe
 
 # attributes
 from tamr_client.attributes.subattribute import SubAttribute
@@ -57,13 +65,5 @@
 )
 import tamr_client.attributes.attribute as attribute
 
-# records
-from tamr_client.datasets.record import PrimaryKeyNotFound
-import tamr_client.datasets.record as record
-
-# dataframe
-from tamr_client.datasets.dataframe import AmbiguousPrimaryKey
-import tamr_client.datasets.dataframe as dataframe
-
 import tamr_client.mastering as mastering
 import tamr_client.project as project
diff --git a/tamr_client/attributes/attribute.py b/tamr_client/attributes/attribute.py
@@ -8,7 +8,7 @@
 import tamr_client.attributes.attribute_type as attribute_type
 from tamr_client.attributes.attribute_type import AttributeType
 import tamr_client.attributes.type_alias as type_alias
-from tamr_client.datasets.dataset import Dataset
+from tamr_client.dataset.dataset import Dataset
 import tamr_client.response as response
 from tamr_client.session import Session
 from tamr_client.types import JsonDict

diff --git a/tamr_client/dataset/__init__.py b/tamr_client/dataset/__init__.py
@@ -0,0 +1,5 @@
+# flake8: noqa
+from tamr_client.dataset.dataset import Dataset
+from tamr_client.dataset.dataset import from_resource_id
+from tamr_client.dataset.dataset import DatasetNotFound
+from tamr_client.dataset import dataframe, record
diff --git a/tamr_client/datasets/dataframe.py → tamr_client/dataset/dataframe.py b/tamr_client/datasets/dataframe.py → tamr_client/dataset/dataframe.py
@@ -7,8 +7,8 @@
 
 import pandas as pd
 
-from tamr_client.datasets.dataset import Dataset
-import tamr_client.datasets.record as record
+from tamr_client.dataset import record
+from tamr_client.dataset.dataset import Dataset
 from tamr_client.session import Session
 from tamr_client.types import JsonDict
 

diff --git a/tamr_client/datasets/dataset.py → tamr_client/dataset/dataset.py b/tamr_client/datasets/dataset.py → tamr_client/dataset/dataset.py
diff --git a/tamr_client/datasets/record.py → tamr_client/dataset/record.py b/tamr_client/datasets/record.py → tamr_client/dataset/record.py
@@ -7,7 +7,7 @@
 import json
 from typing import cast, Dict, IO, Iterable, Optional
 
-from tamr_client.datasets.dataset import Dataset
+from tamr_client.dataset.dataset import Dataset
 import tamr_client.response as response
 from tamr_client.session import Session
 from tamr_client.types import JsonDict

diff --git a/tamr_client/datasets/__init__.py b/tamr_client/datasets/__init__.py