Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rm 111 remove upper bound on s3 concat #263

Merged
merged 4 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class GoogleCloudCredentialsHook(GoogleBaseHook):
def get_conn(self) -> 'google.auth.credentials.Credentials':
return self._get_credentials()
return self.get_credentials()

def scopes(self) -> Iterable[str]: # type: ignore
scope: Optional[str] = self._get_field('scope', None)
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def initialize_options(self) -> None:
# 'googleapiclient.discovery.build':
#
# https://github.com/googleapis/google-auth-library-python/issues/190
'google-api-python-client>=1.8.0,<1.9.0',
'google-api-python-client>=1.8.0',
#
# For some reason this issue started happening consistently around 2020-10:
#
Expand All @@ -118,7 +118,7 @@ def initialize_options(self) -> None:
# However, downgrading pip does not seem to resolve it, so it
# doesn't seem to have been caused by a pip upgrade. For now
# we'll explicitly state the dependency for force the install:
'grpcio<2.0dev,>=1.29.0',
'grpcio>=1.29.0',
]

pytest_dependencies = [
Expand Down Expand Up @@ -171,10 +171,10 @@ def initialize_options(self) -> None:


aws_dependencies = [
'awscli>=1,<2',
'awscli>=1',
'boto>=2,<3',
'boto3',
's3-concat>=0.1.7,<0.2'
's3-concat>=0.1.7'
] + smart_open_dependencies

gsheet_dependencies = [
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/airflow/test_google_cloud_credentials_hook.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ def test_get_conn(self):
mock_init.return_value = None
hook = GoogleCloudCredentialsHook()
mock_get_credentials = Mock('get_credentials')
hook._get_credentials = mock_get_credentials
hook.get_credentials = mock_get_credentials
conn = hook.get_conn()
self.assertEqual(conn, mock_get_credentials.return_value)