diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 85a7dba..825be8b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.16.2 +current_version = 1.17.0 commit = False tag = False diff --git a/changelog.md b/changelog.md index f1d0b61..03a446e 100644 --- a/changelog.md +++ b/changelog.md @@ -2,8 +2,8 @@ ## 1.17.0 * New: add `--kms-region` argument to set the KMS region independently from the DDB region. This allows the use of DDB tables in multiple regions with the same KMS key, for example, with DDB Global Tables -* New: `get_session()` now supports passing in only the `profile_name` without AKIDs or SAKs -* Bugfix: #273 #274 Disable logging when `credstash` is imported as a library. This allows `credstash` to be used in contexts where writing to the local disk is not allowed +* New: `get_session()` now supports passing in only the `profile_name` without AKIDs or SAKs (@eisjcormier) +* Bugfix: #273 #274 Disable logging when `credstash` is imported as a library. This allows `credstash` to be used in contexts where writing to the local disk is not allowed, such as AWS Lambda * Bugfix: #269 Remove incompatible Python 3 code to ensure compatibility with Python 2 * Bugfix: #276 Do not catch errors when `credstash` is imported as a library diff --git a/setup.py b/setup.py index 639d4dc..f6106c9 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup name = 'credstash' -version = '1.16.2' +version = '1.17.0' setup( name=name, @@ -32,6 +32,6 @@ ] }, setup_requires=[ - 'nose>=1.3.6', + 'pytest>=5.4.1' ], ) diff --git a/tests/get_session_test.py b/tests/get_session_test.py index b56f36c..983eb14 100644 --- a/tests/get_session_test.py +++ b/tests/get_session_test.py @@ -65,7 +65,7 @@ def test_get_session_no_params(self, mock_session): mock_session.return_value = 'defaultsession' self.assertEqual(get_session(), 'defaultsession') self.assertEqual(get_session(), 'defaultsession') - mock_session.assert_called_once_with() + mock_session.assert_called_once_with(profile_name=None) @patch('boto3.Session') def test_get_session_specify_profile(self, mock_session): diff --git a/tox.ini b/tox.ini index fc28ab8..b325645 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,10 @@ envlist = py36, lint [testenv] commands = - python setup.py nosetests --with-coverage --cover-package=openapi --cover-erase --cover-html + python -m pytest python setup.py sdist bdist_wheel deps = + pytest>=5.4.1 setuptools>=17.1 [testenv:lint]