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.

Sign up for GitHub

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

Jump to bottom

fix migration 3dda56f1c #5468

Merged
merged 2 commits into from
Jul 23, 2018
Merged

fix migration 3dda56f1c #5468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b4a189
fix migration 3dda56f1c
timifasubaa Jul 23, 2018
4176314
add isodate to setup.py:
timifasubaa Jul 23, 2018
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
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ geopy==1.11.0
gunicorn==19.8.0
humanize==0.5.1
idna==2.6
isodate==0.6.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused

Copy link

@graceguo-supercat graceguo-supercat Jul 23, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when we try cherry-pick #5177, we got No module named isodate

markdown==2.6.11
pandas==0.23.1
parsedatetime==2.0.0
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ def get_git_sha():
'gunicorn', # deprecated
'humanize',
'idna',
'isodate',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Migration line 109

'markdown',
'pandas>=0.18.0',
'parsedatetime',
Expand Down
4 changes: 2 additions & 2 deletions superset/migrations/versions/3dda56f1c4c6_migrate_num_period_compare_and_period_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def upgrade():
session = db.Session(bind=bind)

for chart in session.query(Slice):
params = json.loads(chart.params)
params = json.loads(chart.params or '{}')

if not params.get('num_period_compare'):
continue
Expand All @@ -150,7 +150,7 @@ def downgrade():
session = db.Session(bind=bind)

for chart in session.query(Slice):
params = json.loads(chart.params)
params = json.loads(chart.params or '{}')

if 'time_compare' in params or 'comparison_type' in params:
params.pop('time_compare', None)
Expand Down