Skip to content

Commit

Permalink
Fix migrations conflict (#1661)
Browse files Browse the repository at this point in the history
* Fix migrations conflict

* Ignore unusual lint error

Co-authored-by: Saliou Diallo <saliou@audius.co>
  • Loading branch information
sddioulde and Saliou Diallo committed Jul 19, 2021
1 parent 1372581 commit b04393a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

# revision identifiers, used by Alembic.
revision = "534987cb0355"
down_revision = "80271bf86c56"
down_revision = "6cf091d52869"
branch_labels = None
depends_on = None

Expand Down
2 changes: 1 addition & 1 deletion discovery-provider/src/models/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ class Track(Base):
field_visibility = Column(postgresql.JSONB, nullable=True)
stem_of = Column(postgresql.JSONB, nullable=True)

_routes = relationship(
_routes = relationship( # type: ignore
"TrackRoute",
primaryjoin="and_(\
remote(Track.track_id) == foreign(TrackRoute.track_id),\
Expand Down

0 comments on commit b04393a

Please sign in to comment.