From f7b94379290479cc03b0cb96401b27e508eedfb2 Mon Sep 17 00:00:00 2001 From: Matthew Giammar Date: Sun, 31 Oct 2021 18:14:56 -0400 Subject: [PATCH] Update dependencies --- .github/workflows/codeql-analysis.yml | 2 +- app/__init__.py | 4 ++-- app/custom_widgets.py | 4 ++-- app/inv/__init__.py | 4 ++-- app/inv/layout/__init__.py | 4 ++-- app/inv/layout/input.py | 10 ++++++---- app/root/__init__.py | 7 ++++--- app/sims/__init__.py | 4 ++-- app/sims/features/__init__.py | 4 ++-- app/sims/features/fields.py | 4 ++-- app/sims/features/info_modal.py | 4 ++-- app/sims/fit_report/__init__.py | 4 ++-- app/sims/graph.py | 4 ++-- app/sims/home/__init__.py | 4 ++-- app/sims/home/modal.py | 3 ++- app/sims/menubar.py | 4 ++-- app/sims/method/__init__.py | 4 ++-- app/sims/method/fields.py | 4 ++-- app/sims/method/modal.py | 11 +++++++---- app/sims/modal/about.py | 4 ++-- app/sims/modal/help.py | 2 +- app/sims/modal/spectra_download.py | 4 ++-- app/sims/navbar.py | 4 ++-- app/sims/post_simulation/__init__.py | 2 +- app/sims/post_simulation/convolution.py | 11 +++++++---- app/sims/sidebar.py | 6 +++--- app/sims/spin_system/__init__.py | 4 ++-- app/sims/spin_system/site.py | 5 +++-- requirements-dev.txt | 14 ++++++-------- requirements.txt | 8 ++++---- 30 files changed, 81 insertions(+), 72 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 33b3439..d3e6d5d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -35,7 +35,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/app/__init__.py b/app/__init__.py index f6cd8f3..7eba15d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -3,10 +3,10 @@ import os import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html from celery import Celery from dash import Dash +from dash import dcc +from dash import html from .head import head_config from .utils import slogger diff --git a/app/custom_widgets.py b/app/custom_widgets.py index 5ff9265..9c84585 100644 --- a/app/custom_widgets.py +++ b/app/custom_widgets.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc +from dash import html from dash.dependencies import Input from dash.dependencies import Output from dash.dependencies import State diff --git a/app/inv/__init__.py b/app/inv/__init__.py index d9818f7..2d99004 100644 --- a/app/inv/__init__.py +++ b/app/inv/__init__.py @@ -5,12 +5,12 @@ import csdmpy as cp import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html import numpy as np import plotly.graph_objs as go from celery.result import AsyncResult from dash import callback_context as ctx +from dash import dcc +from dash import html from dash.dependencies import Input from dash.dependencies import Output from dash.dependencies import State diff --git a/app/inv/layout/__init__.py b/app/inv/layout/__init__.py index 7371cbe..77a8c02 100644 --- a/app/inv/layout/__init__.py +++ b/app/inv/layout/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc +from dash import html from .input import input_layer diff --git a/app/inv/layout/input.py b/app/inv/layout/input.py index 36a778d..d63ae9a 100644 --- a/app/inv/layout/input.py +++ b/app/inv/layout/input.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc +from dash import html from app.custom_widgets import custom_input_group from app.sims.graph import generate_graph_instance @@ -82,7 +82,8 @@ def inverse_dimensions(): # Kernel def kernel_type(): - label = dbc.InputGroupAddon("Type", addon_type="prepend") + # label = dbc.InputGroupAddon("Type", addon_type="prepend") + label = dbc.InputGroupText("Type") kernel_options = [ {"label": "MAF", "value": "MAF"}, {"label": "Sideband correlation", "value": "sideband-correlation"}, @@ -94,7 +95,8 @@ def kernel_type(): def channel(): - label = dbc.InputGroupAddon("Channel", addon_type="prepend") + # label = dbc.InputGroupAddon("Channel", addon_type="prepend") + label = dbc.InputGroupText("Channel") selection = dbc.Select( options=isotope_options_list, value="29Si", id="INV-kernel-channel" ) diff --git a/app/root/__init__.py b/app/root/__init__.py index b24d988..ea3670d 100644 --- a/app/root/__init__.py +++ b/app/root/__init__.py @@ -2,9 +2,9 @@ import json import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html from dash import callback_context as ctx +from dash import dcc +from dash import html from dash.dependencies import Input from dash.dependencies import Output @@ -53,7 +53,8 @@ def card(item, app_name): # addon_type="prepend" # ), # dbc.Input(id="input-group-search", placeholder="Search on site"), -# dbc.InputGroupAddon(search_button, addon_type="append"), +# # dbc.InputGroupAddon(search_button, addon_type="append"), +# dbc.InputGroupText(search_button) # ], # size="lg", # ) diff --git a/app/sims/__init__.py b/app/sims/__init__.py index bd16575..00b201b 100644 --- a/app/sims/__init__.py +++ b/app/sims/__init__.py @@ -3,11 +3,11 @@ import csdmpy as cp import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html import numpy as np import plotly.graph_objs as go from dash import callback_context as ctx +from dash import dcc +from dash import html from dash import no_update from dash.dependencies import Input from dash.dependencies import Output diff --git a/app/sims/features/__init__.py b/app/sims/features/__init__.py index 92dc8c8..eb643bb 100644 --- a/app/sims/features/__init__.py +++ b/app/sims/features/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc +from dash import html from .fields import features_modal from .fields import fields diff --git a/app/sims/features/fields.py b/app/sims/features/fields.py index bbf9477..d05d1b1 100644 --- a/app/sims/features/fields.py +++ b/app/sims/features/fields.py @@ -2,9 +2,9 @@ from datetime import datetime import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html from dash import callback_context as ctx +from dash import dcc +from dash import html from dash.dependencies import ClientsideFunction from dash.dependencies import Input from dash.dependencies import Output diff --git a/app/sims/features/info_modal.py b/app/sims/features/info_modal.py index 5be73d4..67dffbf 100644 --- a/app/sims/features/info_modal.py +++ b/app/sims/features/info_modal.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc +from dash import html from dash.dependencies import Input from dash.dependencies import Output from dash.dependencies import State diff --git a/app/sims/fit_report/__init__.py b/app/sims/fit_report/__init__.py index 59460cd..1043869 100644 --- a/app/sims/fit_report/__init__.py +++ b/app/sims/fit_report/__init__.py @@ -3,11 +3,11 @@ import os import dash_bootstrap_components as dbc -import dash_core_components as dcc import dash_extensions as de -import dash_html_components as html import pdfkit from dash import callback_context as ctx +from dash import dcc +from dash import html from dash.dependencies import ClientsideFunction from dash.dependencies import Input from dash.dependencies import Output diff --git a/app/sims/graph.py b/app/sims/graph.py index 70d2c6e..43f832a 100644 --- a/app/sims/graph.py +++ b/app/sims/graph.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_core_components as dcc import dash_extensions as de -import dash_html_components as html import plotly.graph_objs as go +from dash import dcc +from dash import html from dash.dependencies import ClientsideFunction from dash.dependencies import Input from dash.dependencies import Output diff --git a/app/sims/home/__init__.py b/app/sims/home/__init__.py index 619f872..7b6bf76 100644 --- a/app/sims/home/__init__.py +++ b/app/sims/home/__init__.py @@ -5,9 +5,9 @@ - Spin system overview """ import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html import numpy as np +from dash import dcc +from dash import html from dash.dependencies import ClientsideFunction from dash.dependencies import Input from dash.dependencies import Output diff --git a/app/sims/home/modal.py b/app/sims/home/modal.py index 6b603e1..39d3024 100644 --- a/app/sims/home/modal.py +++ b/app/sims/home/modal.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- """Modal window for updating simulator title and description""" import dash_bootstrap_components as dbc +from dash import html from dash.dependencies import Input from dash.dependencies import Output from dash.dependencies import State @@ -29,7 +30,7 @@ def description(): def body(): - return dbc.FormGroup([*title(), *description()]) + return html.Div([*title(), *description()]) def footer(): diff --git a/app/sims/menubar.py b/app/sims/menubar.py index 1c1c66c..c493ca3 100644 --- a/app/sims/menubar.py +++ b/app/sims/menubar.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc +from dash import html from dash.dependencies import Input from dash.dependencies import Output from dash.dependencies import State diff --git a/app/sims/method/__init__.py b/app/sims/method/__init__.py index 2d8da20..43b374c 100644 --- a/app/sims/method/__init__.py +++ b/app/sims/method/__init__.py @@ -2,9 +2,9 @@ from datetime import datetime import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html import numpy as np +from dash import dcc +from dash import html from dash.dependencies import ClientsideFunction from dash.dependencies import Input from dash.dependencies import Output diff --git a/app/sims/method/fields.py b/app/sims/method/fields.py index 2ccbbcd..cb8838a 100644 --- a/app/sims/method/fields.py +++ b/app/sims/method/fields.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc +from dash import html from dash.dependencies import Input from dash.dependencies import Output diff --git a/app/sims/method/modal.py b/app/sims/method/modal.py index d5f179a..ebd4716 100644 --- a/app/sims/method/modal.py +++ b/app/sims/method/modal.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Modal window for method selection""" import dash_bootstrap_components as dbc -import dash_core_components as dcc import mrsimulator.methods as mt +from dash import dcc from dash.dependencies import Input from dash.dependencies import Output from dash.dependencies import State @@ -30,12 +30,15 @@ head = dbc.ModalHeader("Select a method") # method selection -method_selection = dcc.Dropdown(id="method-type", options=METHOD_OPTIONS, value=0) +method_selection = dcc.Dropdown( + id="method-type", options=METHOD_OPTIONS, value=0, clearable=False +) # Channel selection -ch_label = dbc.InputGroupAddon("Channel", addon_type="prepend") +# ch_label = dbc.InputGroupAddon("Channel", addon_type="prepend") +ch_label = dbc.InputGroupText("Channel") ch_selection = dbc.Select(options=isotope_options_list, value="1H", id="channel") -channel_ui = dbc.InputGroup([ch_label, ch_selection], className="container") +channel_ui = dbc.InputGroup(["ch_label", ch_selection], className="container") # select button button = dbc.Button( diff --git a/app/sims/modal/about.py b/app/sims/modal/about.py index 86e74c9..36d8a71 100644 --- a/app/sims/modal/about.py +++ b/app/sims/modal/about.py @@ -8,8 +8,8 @@ import json import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc +from dash import html from dash.dependencies import Input from dash.dependencies import Output from mrsimulator import __version__ as mrsim_version diff --git a/app/sims/modal/help.py b/app/sims/modal/help.py index 291b135..f5a7b21 100644 --- a/app/sims/modal/help.py +++ b/app/sims/modal/help.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_html_components as html +from dash import html def get_icon_with_description(icon, description): diff --git a/app/sims/modal/spectra_download.py b/app/sims/modal/spectra_download.py index 805ff61..3011f0e 100644 --- a/app/sims/modal/spectra_download.py +++ b/app/sims/modal/spectra_download.py @@ -2,10 +2,10 @@ import json import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html import plotly from dash import callback_context as ctx +from dash import dcc +from dash import html from dash.dependencies import ClientsideFunction from dash.dependencies import Input from dash.dependencies import Output diff --git a/app/sims/navbar.py b/app/sims/navbar.py index 9a6733a..daca1a4 100644 --- a/app/sims/navbar.py +++ b/app/sims/navbar.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc +from dash import html from .menubar import master_menubar from app import year diff --git a/app/sims/post_simulation/__init__.py b/app/sims/post_simulation/__init__.py index 19dda8f..cd07f72 100644 --- a/app/sims/post_simulation/__init__.py +++ b/app/sims/post_simulation/__init__.py @@ -2,8 +2,8 @@ import json import dash_bootstrap_components as dbc -import dash_html_components as html from dash import callback_context as ctx +from dash import html from dash import no_update from dash.exceptions import PreventUpdate from mrsimulator import parse diff --git a/app/sims/post_simulation/convolution.py b/app/sims/post_simulation/convolution.py index f519785..bca73f1 100644 --- a/app/sims/post_simulation/convolution.py +++ b/app/sims/post_simulation/convolution.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_core_components as dcc from dash import callback_context as ctx +from dash import dcc from app.custom_widgets import container from app.custom_widgets import custom_button @@ -14,7 +14,8 @@ def ui(index, data=None, n_dim=1, n_dv=1, **kwargs): def function_type(index): - type_label = dbc.InputGroupAddon("Type", addon_type="prepend") + # type_label = dbc.InputGroupAddon("Type", addon_type="prepend") + type_label = dbc.InputGroupText("Type") val = "Exponential" if data is None else data["type"] type_select = dbc.Select( options=[ @@ -38,7 +39,8 @@ def arguments(index): ) def dimension_index(index): - input_ = dbc.InputGroupAddon("Spectral dimension indexes", addon_type="prepend") + # input_=dbc.InputGroupAddon("Spectral dimension indexes", addon_type="prepend") + input_ = dbc.InputGroupText("Spectral dimension indexes") value = [0] if data is not None: @@ -53,7 +55,8 @@ def dimension_index(index): return dbc.InputGroup([input_, dim_index], className="input-form") def dependent_variable_index(index): - input_ = dbc.InputGroupAddon("Spin System indexes", addon_type="prepend") + # input_ = dbc.InputGroupAddon("Spin System indexes", addon_type="prepend") + input_ = dbc.InputGroupText("Spin System indexes") options = [{"label": f"{i}", "value": i} for i in range(n_dv)] options += [{"label": "ALL", "value": "None"}] diff --git a/app/sims/sidebar.py b/app/sims/sidebar.py index 2b2ff0f..21929ab 100644 --- a/app/sims/sidebar.py +++ b/app/sims/sidebar.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html +from dash import dcc +from dash import html from dash.dependencies import Input from dash.dependencies import Output from dash.dependencies import State @@ -179,7 +179,7 @@ def body(): integration_info(), number_of_sidebands(), ] - return dbc.FormGroup(form) + return form def footer(): """Modal footer is a close button""" diff --git a/app/sims/spin_system/__init__.py b/app/sims/spin_system/__init__.py index 4ac6271..d59f78b 100644 --- a/app/sims/spin_system/__init__.py +++ b/app/sims/spin_system/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_core_components as dcc -import dash_html_components as html import numpy as np +from dash import dcc +from dash import html from dash.dependencies import ClientsideFunction from dash.dependencies import Input from dash.dependencies import Output diff --git a/app/sims/spin_system/site.py b/app/sims/spin_system/site.py index 3a805a7..a36b303 100644 --- a/app/sims/spin_system/site.py +++ b/app/sims/spin_system/site.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import dash_bootstrap_components as dbc -import dash_html_components as html +from dash import html from dash.dependencies import Input from dash.dependencies import Output from mrsimulator.spin_system.isotope import ISOTOPE_DATA @@ -15,7 +15,8 @@ def isotope_and_shift_ui(): def isotope_ui(): """Isotope""" - label = dbc.InputGroupAddon("Isotope", addon_type="prepend") + # label = dbc.InputGroupAddon("Isotope", addon_type="prepend") + label = dbc.InputGroupText("Isotope") select = dbc.Select(options=isotope_options_list, value="1H", id="isotope") # callback to hide the quadrupolar fields when isotope is I=1/2 diff --git a/requirements-dev.txt b/requirements-dev.txt index d592af6..b98cf94 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,18 +1,16 @@ -flask==1.1.2 +flask==2.0.2 uuid==1.30 -plotly==4.14.3 -dash==1.20.0 -dash_bootstrap_components==0.12.0 +plotly==5.3.1 +dash==1.21.0 +dash_bootstrap_components==1.0.0 dash-extensions==0.0.60 gunicorn==20.1.0 mrsimulator>=0.6.0rc5 -git+git://github.com/lmfit/lmfit-py.git@fdaf1d1fd6a91dbfa68bd7529a9ecfc59b2d3aba#egg=lmfit +lmfit==1.0.3 redis==3.5.3 -celery[redis]==5.0.5 +celery[redis]==5.1.2 mrinversion>=0.1 -beautifulsoup4==4.10.0 -requests==2.26.0 pdfkit==0.6.1 kaleido==0.2.1 diff --git a/requirements.txt b/requirements.txt index a458f9d..e0b554e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -flask==2.0.1 +flask==2.0.2 uuid==1.30 dash-extensions==0.0.60 -plotly==5.1.0 -dash==1.21.0 -dash_bootstrap_components==0.13.0 +plotly==5.3.1 +dash==2.0.0 +dash_bootstrap_components==1.0.0 gunicorn==20.1.0 mrsimulator==0.6.0 lmfit==1.0.3