Migrate 4.x branch's testing and type-testing

mypy.ini

@@ -8,6 +8,11 @@ warn_unused_configs = True
 warn_redundant_casts = True
 warn_incomplete_stub = True
 follow_imports = normal
+show_error_codes = True
+
+# Ignore errors in the docs/conf.py file
+[mypy-conf]
+ignore_errors = True
 
 # TODO: burn these down
 [mypy-tests.*]

pynamodb/connection/base.py

@@ -426,7 +426,7 @@ def _make_api_call(self, operation_name, operation_kwargs):
                 code = data.get('__type', '')
                 if '#' in code:
                     code = code.rsplit('#', 1)[1]
-                botocore_expected_format = {'Error': {'Message': data.get('message', ''), 'Code': code}}
+                botocore_expected_format = {'Error': {'Message': data.get('message', '') or data.get('Message', ''), 'Code': code}}
                 verbose_properties = {
                     'request_id': headers.get('x-amzn-RequestId')
                 }

pytest.ini

@@ -0,0 +1,6 @@
+[pytest]
+markers =
+  ddblocal: requires an mock dynamodb server running on localhost:8000
+env =
+  AWS_ACCESS_KEY_ID=1
+  AWS_SECRET_ACCESS_KEY=2

requirements-dev.txt

@@ -1,13 +1,12 @@
 mock
-pytest
+pytest>=6
+pytest-env
 pytest-mock
 
-# Due to https://github.com/boto/botocore/issues/1872. Remove after botocore fixes.
-python-dateutil==2.8.0
-
-# only used in .travis.yml
+# only used in CI
 coveralls
-mypy==0.761;python_version>="3.7"
+mypy==0.950;python_version>="3.7"
 pytest-cov
-sphinx
-sphinx-rtd-theme
+
+# used for type-checking
+botocore-stubs

setup.py

@@ -31,12 +31,16 @@ def find_stubs(package):
 setup(
     name='pynamodb',
     version=__import__('pynamodb').__version__,
-    packages=find_packages(exclude=('tests', 'tests.integration',)),
+    packages=find_packages(exclude=('examples', 'tests', 'typing_tests', 'tests.integration',)),
     url='http://jlafon.io/pynamodb.html',
+    project_urls={
+        'Source': 'https://github.com/pynamodb/PynamoDB',
+    },
     author='Jharrod LaFon',
     author_email='[email protected]',
     description='A Pythonic Interface to DynamoDB',
     long_description=open('README.rst').read(),
+    long_description_content_type='text/x-rst',
     zip_safe=False,
     license='MIT',
     keywords='python dynamodb amazon',

tests/test_settings.py

@@ -18,5 +18,5 @@ def test_override_old_attributes(settings_str, tmpdir):
     with patch.dict('os.environ', {'PYNAMODB_CONFIG': str(custom_settings)}):
         with pytest.warns(UserWarning) as warns:
             reload_module(pynamodb.settings)
-    assert len(warns) == 1
-    assert 'options are no longer supported' in str(warns[0].message)
+
+    assert any(('options are no longer supported' in str(warn.message)) for warn in warns)