Minor improvements

Pipfile

@@ -4,11 +4,13 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
+tabulate = "*"
+pytest = "*"
+twine = "*"
+requests-mock = "*"
+xlsxwriter = "*"
 
 [packages]
 requests-oauthlib = "*"
-flask = "*"
-twine = "*"
-requests-mock = "*"
-pytest = "*"
 pandas = "*"
+Flask = "*"

noxfile.py

@@ -8,7 +8,7 @@
 def tests(session):
     args = session.posargs
     session.install("pipenv")
-    session.run("pipenv", "sync")
+    session.run("pipenv", "sync", "--dev")
     session.run("pipenv", "run", "pytest", *args)
 
 
@@ -18,7 +18,7 @@ def lint(session):
     session.install("flake8", "black", "isort")
     session.run("flake8", *args)
     session.run("black", "--check", "--diff", *args)
-    session.run("isort", "-m", "3", "--tc", "--check", "--diff", *args)
+    session.run("isort", "--profile", "black", "--check", "--diff", *args)
 
 
 @nox.session
@@ -36,7 +36,7 @@ def black(session):
 def isort(session):
     args = session.posargs or locations
     session.install("isort")
-    session.run("isort", "-m", "3", "--tc", *args)
+    session.run("isort", "--profile", "black", *args)
 
 
 @nox.session

oura/__init__.py

@@ -16,3 +16,4 @@
 from .auth import OAuthRequestHandler, OuraOAuth2Client, PersonalRequestHandler
 from .client import OuraClient
 from .client_pandas import OuraClientDataFrame
+from .export import writers

oura/writers.py → oura/export/writers.py

@@ -28,17 +28,16 @@ def localize(df):
 
     df = df.copy()
     df = localize(df)
-    writer = pd.ExcelWriter(
+    with pd.ExcelWriter(
         file,
         engine="xlsxwriter",
         date_format="m/d/yyy",
         datetime_format="m/d/yyy h:mmAM/PM",
-    )
-    df.to_excel(writer, index=index, **to_excel_kwargs)
-    writer.save()
+    ) as writer:
+        df.to_excel(writer, index=index, **to_excel_kwargs)
 
 
-def tableize(df, tablefmt="pretty", is_print=True, filename=None):
+def tableize(df, tablefmt="pretty", is_print=True):
     """
     Converts dataframe to a formatted table
     For more details, see https://pypi.org/project/tabulate/
@@ -51,9 +50,6 @@ def tableize(df, tablefmt="pretty", is_print=True, filename=None):
 
     :param is_print: print to standard output?
     :type is_print: boolean
-
-    :param filename: optionally, filename to print to
-    :type filename: string
     """
     from tabulate import tabulate
 
@@ -67,7 +63,4 @@ def tableize(df, tablefmt="pretty", is_print=True, filename=None):
     )
     if is_print:
         print(table)
-    if filename:
-        with open(filename, "w") as f:
-            print(table, file=f)
     return table

tests/test_writers.py

@@ -1,37 +1,41 @@
 import os
 
-import pytest
+from oura.export.writers import save_as_xlsx, tableize
 
 from .mock_client import MockDataFrameClient
 
 client = MockDataFrameClient()
 
 
-@pytest.mark.skip
 def test_save_xlsx():
     """
     Check that both raw and edited df's save without issue
     """
-    df_raw = client.sleep_df_raw(start="2020-09-30")
-    df_edited = client.sleep_df_edited(
+    df_raw = client.sleep_df(start="2020-09-30", convert=False)
+    df_edited = client.sleep_df(
         start="2020-09-30",
         end="2020-10-01",
         metrics=["bedtime_start", "bedtime_end", "score"],
     )
     raw_file = "df_raw.xlsx"
     edited_file = "df_edited.xlsx"
-    client.save_as_xlsx(df_raw, raw_file, sheet_name="hello world")
-    client.save_as_xlsx(df_edited, "df_edited.xlsx")
+    save_as_xlsx(df_raw, raw_file, sheet_name="hello world")
+    save_as_xlsx(df_edited, edited_file)
     assert os.path.exists(raw_file)
     assert os.path.exists(edited_file)
 
 
-@pytest.mark.skip
 def test_tableize():
     """
-    Check that df was printed to file
+    Check df table is correct
     """
-    f = "df_tableized.txt"
-    df_raw = client.sleep_df_raw(start="2020-09-30", metrics="score")
-    client.tableize(df_raw, filename=f)
-    assert os.path.exists(f)
+    expected = """
++--------------+-------+
+| summary_date | score |
++--------------+-------+
+|  2017-11-05  |  70   |
++--------------+-------+
+    """.strip()
+    df = client.sleep_df(start="2020-09-30", metrics="score", convert=False)
+    table = tableize(df, is_print=False)
+    assert expected == table