Merge pull request #63 from DrGFreeman/62-fix-ci-moto

Fix failing CI by replacing deprecated moto mock_dynamodb2

Author: DrGFreeman

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
   - id: requirements-txt-fixer
 
 - repo: https://github.com/psf/black
-  rev: 19.10b0
+  rev: 22.3.0
   hooks:
   - id: black
 

dynamo_pandas/dynamo_pandas.py

@@ -216,8 +216,8 @@ def put_df(df, *, table, boto3_kwargs={}):
 
 
 def _to_df(items, *, dtype=None):
-    """Convert an item dictionary or list of item dictionaries into a pandas DataFrame.
-    """
+    """Convert an item dictionary or list of item dictionaries into a pandas
+    DataFrame."""
     if isinstance(items, dict):
         items = [items]
 

tests/conftest.py

@@ -2,7 +2,7 @@
 import os
 
 import boto3
-from moto import mock_dynamodb2
+from moto import mock_dynamodb
 import pytest
 from test_data import large_table_items
 from test_data import test_df
@@ -23,7 +23,7 @@ def aws_credentials():
 @pytest.fixture()
 def ddb_client(aws_credentials):
     """Fixture to mock the dynamodb client using moto."""
-    with mock_dynamodb2():
+    with mock_dynamodb():
         yield boto3.client("dynamodb")
 
 

tests/test_main.py

@@ -88,8 +88,8 @@ def test_no_keys(self, test_df_table):
         )
 
     def test_keys(self, test_df_table):
-        """"Test with keys specified. Also test that keys not in the table are ignored.
-        """
+        """Test with keys specified. Also test that keys not in the table are
+        ignored."""
         df = get_df(table=test_df_table, keys=[{"id": 0}, {"id": 2}, {"id": 3}])
 
         assert {c: t.name for c, t in zip(df.columns, df.dtypes)} == {
@@ -207,7 +207,9 @@ def test_boto3_kwargs_are_passed(self, ddb_client, test_df_table, keys):
 
         # With the correct region we expect to get the items.
         df = get_df(
-            keys=keys, table=test_df_table, boto3_kwargs=dict(region_name="us-east-1"),
+            keys=keys,
+            table=test_df_table,
+            boto3_kwargs=dict(region_name="us-east-1"),
         )
         assert not df.empty
 

tests/test_transactions.py

@@ -73,8 +73,8 @@ def test_from_df_types(self, ddb_client, empty_table, column, id, expected):
         assert resp["Item"] == expected
 
     def test_existing_key_overwrites(self, ddb_client, empty_table):
-        """Test that putting an item for which the key already exists overwrites the item.
-        """
+        """Test that putting an item for which the key already exists overwrites the
+        item."""
         put_item(item=dict(id=0, A=0, B=1), table=empty_table)
 
         put_item(item=dict(id=0, A="abc"), table=empty_table)
@@ -421,7 +421,8 @@ def test_boto3_kwargs_are_passed(self, ddb_client, test_df_table):
 
         # With the correct region we expect to get the items.
         items = get_all_items(
-            table=test_df_table, boto3_kwargs=dict(region_name="us-east-1"),
+            table=test_df_table,
+            boto3_kwargs=dict(region_name="us-east-1"),
         )
         assert items