Support newer versions of smart_open #167
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
records_mover/url/s3/s3_file_url.py
Outdated
| session=self._boto3_session) | ||
| if SMART_OPEN_USE_SESSION: | ||
| return s3_open(bucket_id=self.bucket, | ||
| key_id=self.key, |
There was a problem hiding this comment.
E127 continuation line over-indented for visual indent
records_mover/url/s3/s3_file_url.py
Outdated
| if SMART_OPEN_USE_SESSION: | ||
| return s3_open(bucket_id=self.bucket, | ||
| key_id=self.key, | ||
| mode=mode, |
There was a problem hiding this comment.
E127 continuation line over-indented for visual indent
records_mover/url/s3/s3_file_url.py
Outdated
| return s3_open(bucket_id=self.bucket, | ||
| key_id=self.key, | ||
| mode=mode, | ||
| session=self._boto3_session) |
There was a problem hiding this comment.
E127 continuation line over-indented for visual indent
records_mover/url/s3/s3_file_url.py
Outdated
| session=self._boto3_session) | ||
| else: | ||
| return s3_open(bucket_id=self.bucket, | ||
| key_id=self.key, |
There was a problem hiding this comment.
E127 continuation line over-indented for visual indent
records_mover/url/s3/s3_file_url.py
Outdated
| else: | ||
| return s3_open(bucket_id=self.bucket, | ||
| key_id=self.key, | ||
| mode=mode, |
There was a problem hiding this comment.
E127 continuation line over-indented for visual indent
records_mover/url/s3/s3_file_url.py
Outdated
| return s3_open(bucket_id=self.bucket, | ||
| key_id=self.key, | ||
| mode=mode, | ||
| client=self._boto3_session.client('s3')) |
There was a problem hiding this comment.
E127 continuation line over-indented for visual indent
setup.py
Outdated
| @@ -163,11 +163,11 @@ def initialize_options(self) -> None: | |||
| # somewhere between much longer and forever to provide its output | |||
| # without this line. | |||
| # | |||
| 'rsa>=3.1.4,<=4.5.0', | |||
| #'rsa>=3.1.4,<=4.5.0', | |||
There was a problem hiding this comment.
E265 block comment should start with '# '
tests/unit/url/test_s3_file.py
Outdated
| @@ -8,10 +8,14 @@ def setUp(self): | |||
| self.mock_S3Url = Mock(name='S3Url') | |||
| self.mock_boto3_session = Mock(name='boto3_session') | |||
| self.s3_file_url = S3FileUrl('s3://bucket/topdir/bottomdir/file', | |||
| S3Url=self.mock_S3Url, | |||
| boto3_session=self.mock_boto3_session) | |||
| S3Url=self.mock_S3Url, | |||
There was a problem hiding this comment.
E128 continuation line under-indented for visual indent
tests/unit/url/test_s3_file.py
Outdated
| S3Url=self.mock_S3Url, | ||
| boto3_session=self.mock_boto3_session) | ||
| S3Url=self.mock_S3Url, | ||
| boto3_session=self.mock_boto3_session) |
There was a problem hiding this comment.
E128 continuation line under-indented for visual indent
tests/unit/url/test_s3_file.py
Outdated
| self.mock_s3_resource = self.mock_boto3_session.resource.return_value | ||
| self.mock_s3_client = self.mock_boto3_session.client.return_value | ||
| if SMART_OPEN_USE_SESSION: | ||
| self.open_boto_args = { "session": self.mock_boto3_session } |
tests/unit/url/test_s3_file.py
Outdated
| self.mock_s3_resource = self.mock_boto3_session.resource.return_value | ||
| self.mock_s3_client = self.mock_boto3_session.client.return_value | ||
| if SMART_OPEN_USE_SESSION: | ||
| self.open_boto_args = { "session": self.mock_boto3_session } |
tests/unit/url/test_s3_file.py
Outdated
| if SMART_OPEN_USE_SESSION: | ||
| self.open_boto_args = { "session": self.mock_boto3_session } | ||
| else: | ||
| self.open_boto_args = { "client": self.mock_s3_client } |
tests/unit/url/test_s3_file.py
Outdated
| if SMART_OPEN_USE_SESSION: | ||
| self.open_boto_args = { "session": self.mock_boto3_session } | ||
| else: | ||
| self.open_boto_args = { "client": self.mock_s3_client } |
cwegrzyn
force-pushed
the
smart-open-bump
branch
from
6812808 to
e4df4b7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Widen the dependency on smart_open and gracefully handle breaking changes to S3 support in newer versions