Merge 6ffe036 into a1e9df6

pynamodb · Jun 27, 2019 · 7a4d445 · 7a4d445
2 parents a1e9df6 + 6ffe036
commit 7a4d445
Show file tree

Hide file tree

Showing 23 changed files with 11 additions and 12 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,3 +1,2 @@
 [run]
 source = pynamodb/.
-omit = pynamodb/tests/*
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,7 @@ before_script:
   - sleep 2
 
 script:
-  - py.test --cov-report term-missing --cov=pynamodb pynamodb/tests/
+  - py.test --cov-report term-missing --cov=pynamodb tests
   - if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]]; then mypy .; fi
 
 after_success:

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@ def find_stubs(package):
 setup(
     name='pynamodb',
     version=__import__('pynamodb').__version__,
-    packages=find_packages(),
+    packages=find_packages(exclude=('tests',)),
     url='http://jlafon.io/pynamodb.html',
     author='Jharrod LaFon',
     author_email='jlafon@eyesopen.com',

diff --git a/pynamodb/tests/__init__.py → tests/__init__.py b/pynamodb/tests/__init__.py → tests/__init__.py
diff --git a/pynamodb/tests/data.py → tests/data.py b/pynamodb/tests/data.py → tests/data.py
diff --git a/pynamodb/tests/deep_eq.py → tests/deep_eq.py b/pynamodb/tests/deep_eq.py → tests/deep_eq.py
diff --git a/...ests/integration/base_integration_test.py → tests/integration/base_integration_test.py b/...ests/integration/base_integration_test.py → tests/integration/base_integration_test.py
diff --git a/...b/tests/integration/binary_update_test.py → tests/integration/binary_update_test.py b/...b/tests/integration/binary_update_test.py → tests/integration/binary_update_test.py
diff --git a/pynamodb/tests/integration/conftest.py → tests/integration/conftest.py b/pynamodb/tests/integration/conftest.py → tests/integration/conftest.py
diff --git a/...sts/integration/model_integration_test.py → tests/integration/model_integration_test.py b/...sts/integration/model_integration_test.py → tests/integration/model_integration_test.py
diff --git a/...sts/integration/table_integration_test.py → tests/integration/table_integration_test.py b/...sts/integration/table_integration_test.py → tests/integration/table_integration_test.py
diff --git a/pynamodb/tests/mypy_helpers.py → tests/mypy_helpers.py b/pynamodb/tests/mypy_helpers.py → tests/mypy_helpers.py
diff --git a/pynamodb/tests/response.py → tests/response.py b/pynamodb/tests/response.py → tests/response.py
diff --git a/pynamodb/tests/test_attributes.py → tests/test_attributes.py b/pynamodb/tests/test_attributes.py → tests/test_attributes.py
diff --git a/pynamodb/tests/test_base_connection.py → tests/test_base_connection.py b/pynamodb/tests/test_base_connection.py → tests/test_base_connection.py
@@ -22,8 +22,8 @@
     PROVISIONED_BILLING_MODE, PAY_PER_REQUEST_BILLING_MODE)
 from pynamodb.expressions.operand import Path, Value
 from pynamodb.expressions.update import SetAction
-from pynamodb.tests.data import DESCRIBE_TABLE_DATA, GET_ITEM_DATA, LIST_TABLE_DATA
-from pynamodb.tests.deep_eq import deep_eq
+from .data import DESCRIBE_TABLE_DATA, GET_ITEM_DATA, LIST_TABLE_DATA
+from .deep_eq import deep_eq
 
 if six.PY3:
     from unittest.mock import patch

diff --git a/pynamodb/tests/test_expressions.py → tests/test_expressions.py b/pynamodb/tests/test_expressions.py → tests/test_expressions.py
diff --git a/pynamodb/tests/test_model.py → tests/test_model.py b/pynamodb/tests/test_model.py → tests/test_model.py
@@ -12,7 +12,7 @@
 from botocore.client import ClientError
 import pytest
 
-from pynamodb.tests.deep_eq import deep_eq
+from .deep_eq import deep_eq
 from pynamodb.connection.util import pythonic
 from pynamodb.exceptions import DoesNotExist, TableError
 from pynamodb.types import RANGE
@@ -30,7 +30,7 @@
     UnicodeAttribute, NumberAttribute, BinaryAttribute, UTCDateTimeAttribute,
     UnicodeSetAttribute, NumberSetAttribute, BinarySetAttribute, MapAttribute,
     BooleanAttribute, ListAttribute)
-from pynamodb.tests.data import (
+from .data import (
     MODEL_TABLE_DATA, GET_MODEL_ITEM_DATA, SIMPLE_MODEL_TABLE_DATA,
     DESCRIBE_TABLE_DATA_PAY_PER_REQUEST,
     BATCH_GET_ITEMS, SIMPLE_BATCH_GET_ITEMS, COMPLEX_TABLE_DATA,

diff --git a/pynamodb/tests/test_mypy.py → tests/test_mypy.py b/pynamodb/tests/test_mypy.py → tests/test_mypy.py
@@ -5,7 +5,7 @@
 import pytest
 
 pytest.importorskip('mypy')  # we only install mypy in python>=3.6 tests
-pytest.register_assert_rewrite('pynamodb.tests.mypy_helpers')
+pytest.register_assert_rewrite('tests.mypy_helpers')
 from .mypy_helpers import assert_mypy_output  # noqa
 
 

diff --git a/pynamodb/tests/test_pagination.py → tests/test_pagination.py b/pynamodb/tests/test_pagination.py → tests/test_pagination.py
diff --git a/pynamodb/tests/test_settings.py → tests/test_settings.py b/pynamodb/tests/test_settings.py → tests/test_settings.py
diff --git a/pynamodb/tests/test_signals.py → tests/test_signals.py b/pynamodb/tests/test_signals.py → tests/test_signals.py
diff --git a/pynamodb/tests/test_table_connection.py → tests/test_table_connection.py b/pynamodb/tests/test_table_connection.py → tests/test_table_connection.py
@@ -7,8 +7,8 @@
 from pynamodb.connection import TableConnection
 from pynamodb.constants import DEFAULT_REGION, PROVISIONED_BILLING_MODE
 from pynamodb.expressions.operand import Path
-from pynamodb.tests.data import DESCRIBE_TABLE_DATA, GET_ITEM_DATA
-from pynamodb.tests.response import HttpOK
+from .data import DESCRIBE_TABLE_DATA, GET_ITEM_DATA
+from .response import HttpOK
 
 if six.PY3:
     from unittest.mock import patch

diff --git a/tox.ini b/tox.ini
@@ -8,5 +8,5 @@ envlist = py26,py27,py33,py34,py35,py36,pypy
 deps = -rrequirements-dev.txt
 ; To include integration tests that require DynamoDB Local,
 ; use this instead:
-;commands = py.test pynamodb/tests
-commands = py.test -m 'not ddblocal' pynamodb/tests
+;commands = py.test tests
+commands = py.test -m 'not ddblocal' tests