Skip to content

Commit

Permalink
Merge pull request #711 from EvanBldy/master
Browse files Browse the repository at this point in the history
various fixes
  • Loading branch information
EvanBldy authored Sep 25, 2023
2 parents 26a0f05 + 9e823be commit 8c2cfa5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ install_requires =
flask-migrate==4.0.5
flask-socketio==5.3.6
flask==2.3.3
gazu==0.9.9
gazu==0.9.11
gevent-websocket==0.10.1
gevent==23.9.1
gunicorn==21.2.0
Expand All @@ -54,11 +54,11 @@ install_requires =
Jinja2==3.1.2
ldap3==2.9.1
matterhook==0.2
meilisearch==0.28.2
meilisearch==0.28.3
OpenTimelineIO==0.15.0
pillow==10.0.1
psutil==5.9.5
psycopg[binary]==3.1.10
psycopg[binary]==3.1.11
pygelf==0.4.2
pyotp==2.9.0
python-nomad==2.0.0
Expand All @@ -70,7 +70,7 @@ install_requires =
rq==1.15.1
slackclient==2.9.4
sqlalchemy_utils==0.41.1
sqlalchemy==2.0.20
sqlalchemy==2.0.21
ua-parser==0.18.0
werkzeug==2.3.7

Expand Down
2 changes: 1 addition & 1 deletion zou/app/blueprints/source/csv/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def import_row(self, row, project_id):
)

elif self.is_update:
entity.update(asset_new_values)
entity.update({**asset_values, **asset_new_values})

index_service.remove_asset_index(entity.id)
index_service.index_asset(entity)
Expand Down
2 changes: 1 addition & 1 deletion zou/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def migrate_db(message):


@cli.command()
@click.option("--revision", default=None)
@click.option("--revision", default="-1")
def downgrade_db(revision):
"""
Downgrade db to previous revision of the database schema
Expand Down

0 comments on commit 8c2cfa5

Please sign in to comment.