From f6a6763e5e9b0757e13bec43d0c5b4d066ecfa4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Mon, 27 May 2019 14:16:49 -0400 Subject: [PATCH 1/5] leap of faith sort of deal --- .circleci/config.yml | 8 ++++-- requirements-base.txt | 56 ----------------------------------------- requirements-v0.txt | 4 --- requirements.txt | 58 +++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 62 insertions(+), 64 deletions(-) delete mode 100644 requirements-base.txt delete mode 100644 requirements-v0.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index 4a9199b90..c2a6bbebe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,6 +31,8 @@ jobs: python -m venv venv || virtualenv venv . venv/bin/activate pip install -r requirements.txt --quiet + git clone git@github.com:plotly/dash.git + pip install -e ./dash --quiet - run: name: Build @@ -168,7 +170,7 @@ jobs: name: Install requirements command: | . venv/bin/activate - pip install -r requirements-base.txt --quiet + pip install -r requirements.txt --quiet - run: name: Run eslint @@ -200,7 +202,9 @@ jobs: sudo pip install --upgrade virtualenv python -m venv venv || virtualenv venv . venv/bin/activate - pip install -r requirements-base.txt --quiet + pip install -r requirements.txt --quiet + git clone git@github.com:plotly/dash.git + pip install -e ./dash --quiet npm install - run: diff --git a/requirements-base.txt b/requirements-base.txt deleted file mode 100644 index b610d97ce..000000000 --- a/requirements-base.txt +++ /dev/null @@ -1,56 +0,0 @@ -appdirs==1.4.3 -appnope==0.1.0 -astroid==2.0.4 -attrs==18.2.0 -backcall==0.1.0 -black==18.6b4 -certifi==2018.8.24 -chardet==3.0.4 -chromedriver-binary==2.41.0 -click==6.7 -decorator==4.3.0 -flake8==3.5.0 -Flask==1.0.2 -Flask-Compress==1.4.0 -gunicorn==19.9.0 -idna==2.7 -ipdb==0.11 -ipython==6.5.0 -ipython-genutils==0.2.0 -isort==4.3.4 -itsdangerous==0.24 -jedi==0.12.1 -Jinja2==2.10 -jsonschema==2.6.0 -jupyter-core==4.4.0 -lazy-object-proxy==1.3.1 -MarkupSafe==1.0 -mccabe==0.6.1 -nbformat==4.4.0 -numpy==1.15.1 -pandas==0.24.1 -parso==0.3.1 -percy==2.0.0 -pexpect==4.6.0 -pickleshare==0.7.4 -plotly==3.2.1 -prompt-toolkit==1.0.15 -ptyprocess==0.6.0 -pycodestyle==2.3.1 -pyflakes==1.6.0 -Pygments==2.2.0 -pylint==2.1.1 -python-dateutil==2.7.3 -pytz==2018.5 -requests==2.20.0 -retrying==1.3.3 -selenium==3.14.0 -simplegeneric==0.8.1 -six==1.11.0 -toml==0.9.6 -traitlets==4.3.2 -typed-ast==1.1.0 -urllib3==1.23 -wcwidth==0.1.7 -Werkzeug==0.14.1 -wrapt==1.10.11 diff --git a/requirements-v0.txt b/requirements-v0.txt deleted file mode 100644 index 8a978093d..000000000 --- a/requirements-v0.txt +++ /dev/null @@ -1,4 +0,0 @@ -git+git://github.com/plotly/dash@master#egg=dash -git+git://github.com/plotly/dash-core-components@master#egg=dash_core_components -git+git://github.com/plotly/dash-html-components@master#egg=dash_html_components -git+git://github.com/plotly/dash-renderer@master#egg=dash_renderer \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5d17344a8..b610d97ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,56 @@ --r requirements-base.txt --r requirements-v0.txt \ No newline at end of file +appdirs==1.4.3 +appnope==0.1.0 +astroid==2.0.4 +attrs==18.2.0 +backcall==0.1.0 +black==18.6b4 +certifi==2018.8.24 +chardet==3.0.4 +chromedriver-binary==2.41.0 +click==6.7 +decorator==4.3.0 +flake8==3.5.0 +Flask==1.0.2 +Flask-Compress==1.4.0 +gunicorn==19.9.0 +idna==2.7 +ipdb==0.11 +ipython==6.5.0 +ipython-genutils==0.2.0 +isort==4.3.4 +itsdangerous==0.24 +jedi==0.12.1 +Jinja2==2.10 +jsonschema==2.6.0 +jupyter-core==4.4.0 +lazy-object-proxy==1.3.1 +MarkupSafe==1.0 +mccabe==0.6.1 +nbformat==4.4.0 +numpy==1.15.1 +pandas==0.24.1 +parso==0.3.1 +percy==2.0.0 +pexpect==4.6.0 +pickleshare==0.7.4 +plotly==3.2.1 +prompt-toolkit==1.0.15 +ptyprocess==0.6.0 +pycodestyle==2.3.1 +pyflakes==1.6.0 +Pygments==2.2.0 +pylint==2.1.1 +python-dateutil==2.7.3 +pytz==2018.5 +requests==2.20.0 +retrying==1.3.3 +selenium==3.14.0 +simplegeneric==0.8.1 +six==1.11.0 +toml==0.9.6 +traitlets==4.3.2 +typed-ast==1.1.0 +urllib3==1.23 +wcwidth==0.1.7 +Werkzeug==0.14.1 +wrapt==1.10.11 From a2be83d92223c602fa23fc0413f9d1ce58fffe57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Mon, 27 May 2019 14:31:27 -0400 Subject: [PATCH 2/5] no multi dash --- .circleci/config.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2a6bbebe..02159ee11 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,6 +107,8 @@ jobs: python -m venv venv || virtualenv venv . venv/bin/activate pip install -r requirements.txt --quiet + git clone git@github.com:plotly/dash.git + pip install -e ./dash --quiet - run: name: Run tests @@ -210,15 +212,7 @@ jobs: - run: name: Install dependencies (dash) command: | - git clone git@github.com:plotly/dash.git - git clone git@github.com:plotly/dash-renderer.git - git clone git@github.com:plotly/dash-core-components.git - git clone git@github.com:plotly/dash-html-components.git . venv/bin/activate - pip install -e ./dash --quiet - cd dash-renderer && npm install --ignore-scripts && npm run build && pip install -e . && cd .. - cd dash-core-components && npm install --ignore-scripts && npm run build && pip install -e . && cd .. - cd dash-html-components && npm install --ignore-scripts && npm run build && pip install -e . && cd .. - run: name: Install test requirements From 3b0ab071881bc342545cee70fe30c890594a5a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Mon, 27 May 2019 14:37:16 -0400 Subject: [PATCH 3/5] placement? --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 02159ee11..d19b61ea3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -205,14 +205,14 @@ jobs: python -m venv venv || virtualenv venv . venv/bin/activate pip install -r requirements.txt --quiet - git clone git@github.com:plotly/dash.git - pip install -e ./dash --quiet npm install - run: name: Install dependencies (dash) command: | . venv/bin/activate + git clone git@github.com:plotly/dash.git + pip install -e ./dash --quiet - run: name: Install test requirements From cf9bece9f43677943cde6d758dc11244b3a87e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Tue, 28 May 2019 08:52:42 -0400 Subject: [PATCH 4/5] dash-main --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d19b61ea3..14d43569c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,8 +31,8 @@ jobs: python -m venv venv || virtualenv venv . venv/bin/activate pip install -r requirements.txt --quiet - git clone git@github.com:plotly/dash.git - pip install -e ./dash --quiet + git clone git@github.com:plotly/dash.git dash-main + pip install -e ./dash-main --quiet - run: name: Build @@ -107,8 +107,8 @@ jobs: python -m venv venv || virtualenv venv . venv/bin/activate pip install -r requirements.txt --quiet - git clone git@github.com:plotly/dash.git - pip install -e ./dash --quiet + git clone git@github.com:plotly/dash.git dash-main + pip install -e ./dash-main --quiet - run: name: Run tests @@ -211,8 +211,8 @@ jobs: name: Install dependencies (dash) command: | . venv/bin/activate - git clone git@github.com:plotly/dash.git - pip install -e ./dash --quiet + git clone git@github.com:plotly/dash.git dash-main + pip install -e ./dash-main --quiet - run: name: Install test requirements From c09c77be4f5fc28abc6662f424e9b6796b4cfc53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Tue, 28 May 2019 11:06:41 -0400 Subject: [PATCH 5/5] shallow clone --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 14d43569c..07464896a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: python -m venv venv || virtualenv venv . venv/bin/activate pip install -r requirements.txt --quiet - git clone 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 --quiet - run: @@ -107,7 +107,7 @@ jobs: python -m venv venv || virtualenv venv . venv/bin/activate pip install -r requirements.txt --quiet - git clone 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 --quiet - run: @@ -211,7 +211,7 @@ jobs: name: Install dependencies (dash) command: | . venv/bin/activate - git clone 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 --quiet - run: