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

Flask: Bump pandas from 1.2.5 to 1.3.0 in /flask #701

Merged
merged 3 commits into from
Jul 8, 2021
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
5 changes: 4 additions & 1 deletion flask/app/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
from .extensions import db, oauth
from .utils import enum_validate, transaction_or_abort, validate_json, update_last_login

import numpy as np

routes = Blueprint("routes", __name__)


Expand Down Expand Up @@ -282,7 +284,7 @@ def bulk_update():
try:
app.logger.debug("Reading in csv and converted to a dictionary..")
dat = pd.read_csv(StringIO(request.data.decode("utf-8")))
dat = dat.where(pd.notnull(dat), None)
dat = dat.replace({np.nan: None})
dat = dat.to_dict(orient="records")
except Exception as err:
app.logger.error(
Expand Down Expand Up @@ -553,6 +555,7 @@ def bulk_update():
app.logger.debug("\tAdding users groups to the dataset")
dataset.groups += groups
app.logger.debug("\tCreating dataset entry in the database..")
app.logger.debug(dataset.__dict__)
db.session.add(dataset)
transaction_or_abort(db.session.flush)
app.logger.debug("\tDone")
Expand Down
2 changes: 1 addition & 1 deletion flask/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ numpy==1.20.2
# via pandas
packaging==20.9
# via pytest
pandas==1.2.5
pandas==1.3.0
# via -r requirements.in
pathspec==0.8.1
# via black
Expand Down
2 changes: 1 addition & 1 deletion flask/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ minio==7.0.4
# via -r requirements.in
numpy==1.20.2
# via pandas
pandas==1.2.5
pandas==1.3.0
# via -r requirements.in
pycparser==2.20
# via cffi
Expand Down