Skip to content

Commit

Permalink
Merge pull request #54 from Wikia/dev
Browse files Browse the repository at this point in the history
Version 0.0.8
  • Loading branch information
martynaut authored Jun 5, 2024
2 parents d023092 + 44abd31 commit 98df093
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ sroka.egg-info/
**.csv
config.ini
sroka_test_file.py
environments.txt
build
4 changes: 3 additions & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
# the repo. Unless a later match takes precedence,
# @martynaut and @dorotamierzwa will be requested for
# review when someone opens a pull request.
* @martynaut @dorotamierzwa
* @martynaut
* @Wikia/adeng
* @Wikia/data-engineering
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Package providing simple Python access to data in:
* MySQL
* neo4j

Sroka library was checked to work for Python **3.7, 3.8 and 3.9**.
Sroka library was checked to work for Python **>=3.8, <=3.11**.

## Developers

Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ google-auth-httplib2>=0.0.3
google_api_python_client>=1.6.7
google_auth_oauthlib>=0.2.0
google-cloud-bigquery>=1.24.0
googleads>=29.0.0
googleads>=42.0.0
isort==4.3.9
lxml>=4.6.5
mysql-connector-python==8.0.17
Expand All @@ -15,6 +15,6 @@ pyarrow>=0.11.1
qds_sdk>=1.10.1
requests>=2.20
retrying>=1.3.3
urllib3>=1.26.5
urllib3>=1.26.18
py2neo>=4.2.0
db-dtypes
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

setuptools.setup(
name="sroka",
version="0.0.7",
version="0.0.8",
author="Ad Engineering FANDOM",
author_email="[email protected]",
description="Package for access GA, GAM, MOAT, Qubole, Athena, S3, Rubicon APIs, BigQuery, MySQL",
Expand Down
4 changes: 2 additions & 2 deletions sroka/api/s3_connection/s3_connection_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def _download_data(key_prefix, s3, bucket_name, prefix, sep, skip_empty_files=Tr
print('File not found on s3')
return pd.DataFrame([])
try:
df_list.append(pd.read_csv(data, error_bad_lines=False, warn_bad_lines=False, sep=sep,
df_list.append(pd.read_csv(data, on_bad_lines='skip', sep=sep,
header=header_setting))
except UnicodeDecodeError:
df_list.append(pq.read_pandas(data).to_pandas())
Expand All @@ -47,7 +47,7 @@ def _download_data(key_prefix, s3, bucket_name, prefix, sep, skip_empty_files=Tr
if 'SUCCESS' not in file.key:
tmp = StringIO(str(file.get()['Body'].read(), 'utf-8'))
try:
data = pd.read_csv(tmp, error_bad_lines=False, warn_bad_lines=False, sep=sep,
data = pd.read_csv(tmp, on_bad_lines='skip', sep=sep,
header=header_setting)
df_list.append(data)
except EmptyDataError:
Expand Down

0 comments on commit 98df093

Please sign in to comment.