From 2ddffde902d0c63dd4ee09e2534954729a2a7c98 Mon Sep 17 00:00:00 2001 From: alexcjohnson Date: Thu, 17 Dec 2020 10:55:47 -0500 Subject: [PATCH 1/3] use dash loosen-testing-reqs branch and fix linting --- .circleci/config.yml | 4 ++-- dash_table_base/__init__.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 75ed4940b..ff8a7e87f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: python -m venv venv || virtualenv venv . venv/bin/activate pip install -r dev-requirements.txt --quiet - git clone --depth 1 git@github.com:plotly/dash.git dash-main + git clone --depth 1 -b loosen-testing-reqs git@github.com:plotly/dash.git dash-main pip install -e ./dash-main[dev,testing] --quiet cd dash-main/dash-renderer && npm ci && npm run build && pip install -e . && cd ./../.. @@ -185,7 +185,7 @@ jobs: command: | . venv/bin/activate pip install -r dev-requirements.txt --quiet - pip install --progress-bar off -e git+https://github.com/plotly/dash.git@dev#egg=dash[dev,testing] + pip install --progress-bar off -e git+https://github.com/plotly/dash.git@loosen-testing-reqs#egg=dash[dev,testing] - run: name: Run eslint diff --git a/dash_table_base/__init__.py b/dash_table_base/__init__.py index 1d1f520c5..56e6ef007 100644 --- a/dash_table_base/__init__.py +++ b/dash_table_base/__init__.py @@ -6,9 +6,6 @@ import dash as _dash -from ._imports_ import * # noqa: F401, F403 -from ._imports_ import __all__ - if not hasattr(_dash, '__plotly_dash') and not hasattr(_dash, 'development'): print( "Dash was not successfully imported. " @@ -18,6 +15,9 @@ ) _sys.exit(1) +from ._imports_ import * # noqa: E402, F401, F403 +from ._imports_ import __all__ # noqa: E402 + _basepath = _os.path.dirname(__file__) _filepath = _os.path.abspath(_os.path.join(_basepath, "package-info.json")) with open(_filepath) as f: From e3051da3f2a04bf302dede45513d2a8c63f55a8c Mon Sep 17 00:00:00 2001 From: alexcjohnson Date: Thu, 17 Dec 2020 12:10:49 -0500 Subject: [PATCH 2/3] prohibit xlrd v2, so xlsx will still work --- dev-requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 54c6d04fc..f9e119f69 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,4 +1,4 @@ dash-bootstrap-components==0.10.7 pandas preconditions -xlrd \ No newline at end of file +xlrd<2 diff --git a/requirements.txt b/requirements.txt index 6ab664aa8..b9b3fe878 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,4 +51,4 @@ urllib3==1.23 wcwidth==0.1.7 Werkzeug==0.15.6 wrapt==1.10.11 -xlrd>= 1.0.0 +xlrd>=1.0.0,<2 From e6f57fb8dc44063864b2f891906501ffc87084d3 Mon Sep 17 00:00:00 2001 From: alexcjohnson Date: Thu, 17 Dec 2020 12:37:02 -0500 Subject: [PATCH 3/3] back to dev branch of dash --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ff8a7e87f..75ed4940b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: python -m venv venv || virtualenv venv . venv/bin/activate pip install -r dev-requirements.txt --quiet - git clone --depth 1 -b loosen-testing-reqs git@github.com:plotly/dash.git dash-main + git clone --depth 1 git@github.com:plotly/dash.git dash-main pip install -e ./dash-main[dev,testing] --quiet cd dash-main/dash-renderer && npm ci && npm run build && pip install -e . && cd ./../.. @@ -185,7 +185,7 @@ jobs: command: | . venv/bin/activate pip install -r dev-requirements.txt --quiet - pip install --progress-bar off -e git+https://github.com/plotly/dash.git@loosen-testing-reqs#egg=dash[dev,testing] + pip install --progress-bar off -e git+https://github.com/plotly/dash.git@dev#egg=dash[dev,testing] - run: name: Run eslint