From 08736ec073e5ac6d8200b6124cc08e47db89c265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Tue, 2 Jun 2020 15:03:10 -0400 Subject: [PATCH 1/7] 3.6.9 | 3.7.6 --- .circleci/config.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d89a1f61..52664aeb6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: lint-unit-37: &lint-unit working_directory: ~/project docker: - - image: circleci/python:3.7-stretch-node-browsers + - image: circleci/python:3.7.6-stretch-node-browsers environment: PYTHON_VERSION: py37 steps: @@ -42,7 +42,7 @@ jobs: lint-unit-36: <<: *lint-unit docker: - - image: circleci/python:3.6-stretch-node-browsers + - image: circleci/python:3.6.9-stretch-node-browsers environment: PYTHON_VERSION: py36 @@ -56,7 +56,7 @@ jobs: build-dash-37: &build-dash working_directory: ~/project docker: - - image: circleci/python:3.7-stretch-node-browsers + - image: circleci/python:3.7.6-stretch-node-browsers environment: PYTHON_VERSION: py37 steps: @@ -97,7 +97,7 @@ jobs: build-dash-36: <<: *build-dash docker: - - image: circleci/python:3.6-stretch-node-browsers + - image: circleci/python:3.6.9-stretch-node-browsers environment: PYTHON_VERSION: py36 @@ -111,7 +111,7 @@ jobs: test-37: &test working_directory: ~/project docker: - - image: circleci/python:3.7-stretch-node-browsers + - image: circleci/python:3.7.6-stretch-node-browsers environment: PYTHON_VERSION: py37 PERCY_PARALLEL_TOTAL: -1 @@ -143,7 +143,7 @@ jobs: test-36: <<: *test docker: - - image: circleci/python:3.6-stretch-node-browsers + - image: circleci/python:3.6.9-stretch-node-browsers environment: PYTHON_VERSION: py36 PERCY_ENABLE: 0 @@ -159,7 +159,7 @@ jobs: test-legacy-37: &test-legacy working_directory: ~/project docker: - - image: circleci/python:3.7-stretch-node-browsers + - image: circleci/python:3.7.6-stretch-node-browsers environment: PYTHON_VERSION: py37 PERCY_PARALLEL_TOTAL: -1 @@ -193,7 +193,7 @@ jobs: test-legacy-36: <<: *test-legacy docker: - - image: circleci/python:3.6-stretch-node-browsers + - image: circleci/python:3.6.9-stretch-node-browsers environment: PYTHON_VERSION: py36 PERCY_ENABLE: 0 From 91a5c87bfcce47795de6c2a91b8920a294444a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Tue, 2 Jun 2020 15:06:30 -0400 Subject: [PATCH 2/7] bust cache --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 52664aeb6..543ce80fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: - checkout - run: echo $PYTHON_VERSION > ver.txt - restore_cache: - key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} - run: name: 🐍 pip dev requirements command: | @@ -24,7 +24,7 @@ jobs: python -m venv venv || virtualenv venv && . venv/bin/activate pip install --progress-bar off --no-cache-dir -r dev-requirements.txt - save_cache: - key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} paths: - venv - run: @@ -63,7 +63,7 @@ jobs: - checkout - run: echo $PYTHON_VERSION > ver.txt - restore_cache: - key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} - run: name: 🐍 pip dev requirements command: | @@ -71,7 +71,7 @@ jobs: python -m venv venv || virtualenv venv && . venv/bin/activate pip install --progress-bar off --no-cache-dir -r dev-requirements.txt - save_cache: - key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} paths: - venv - run: @@ -120,7 +120,7 @@ jobs: - checkout - run: echo $PYTHON_VERSION > ver.txt - restore_cache: - key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} - attach_workspace: at: ~/project - run: @@ -168,7 +168,7 @@ jobs: - checkout - run: echo $PYTHON_VERSION > ver.txt - restore_cache: - key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} - attach_workspace: at: ~/project - run: From 73f7ac1f9d691934ee96018224220ddb8e1ba96b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Tue, 2 Jun 2020 15:13:42 -0400 Subject: [PATCH 3/7] remove flake8 from dev-deps of dcc --- .circleci/config.yml | 12 ++++++------ dev-requirements.txt | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 543ce80fc..52664aeb6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: - checkout - run: echo $PYTHON_VERSION > ver.txt - restore_cache: - key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} - run: name: 🐍 pip dev requirements command: | @@ -24,7 +24,7 @@ jobs: python -m venv venv || virtualenv venv && . venv/bin/activate pip install --progress-bar off --no-cache-dir -r dev-requirements.txt - save_cache: - key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} paths: - venv - run: @@ -63,7 +63,7 @@ jobs: - checkout - run: echo $PYTHON_VERSION > ver.txt - restore_cache: - key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} - run: name: 🐍 pip dev requirements command: | @@ -71,7 +71,7 @@ jobs: python -m venv venv || virtualenv venv && . venv/bin/activate pip install --progress-bar off --no-cache-dir -r dev-requirements.txt - save_cache: - key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} paths: - venv - run: @@ -120,7 +120,7 @@ jobs: - checkout - run: echo $PYTHON_VERSION > ver.txt - restore_cache: - key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} - attach_workspace: at: ~/project - run: @@ -168,7 +168,7 @@ jobs: - checkout - run: echo $PYTHON_VERSION > ver.txt - restore_cache: - key: dep1-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} + key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} - attach_workspace: at: ~/project - run: diff --git a/dev-requirements.txt b/dev-requirements.txt index 649c3852d..71cc5a1c1 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,4 @@ pandas xlrd -flake8 mimesis;python_version>="3.6" virtualenv;python_version=="2.7" \ No newline at end of file From 5f09381e80afa9f2566ec3ad9978dea8ca29c219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Tue, 2 Jun 2020 16:04:07 -0400 Subject: [PATCH 4/7] install dash from dev for linting --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 52664aeb6..5ee9eaacf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,6 +23,8 @@ jobs: sudo pip install virtualenv --upgrade python -m venv venv || virtualenv venv && . venv/bin/activate pip install --progress-bar off --no-cache-dir -r dev-requirements.txt + git clone --depth 1 https://github.com/plotly/dash.git dash-main + pip install --progress-bar off -e ./dash-main[dev,testing] - save_cache: key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} paths: From cce89adcbe282ce5c62bd15b7b8286769991590d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Tue, 2 Jun 2020 16:23:19 -0400 Subject: [PATCH 5/7] check flake8 version? --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ee9eaacf..56d82252a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,6 +34,7 @@ jobs: command: | . venv/bin/activate set -eo pipefail + flake8 --version npm ci npm run lint - run: From d639ae22781a8e55e31e7b39ddb6f1b78fc6a07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Tue, 2 Jun 2020 16:34:52 -0400 Subject: [PATCH 6/7] dev dash/egg --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 56d82252a..8d3f6c62c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,9 +22,8 @@ jobs: command: | sudo pip install virtualenv --upgrade python -m venv venv || virtualenv venv && . venv/bin/activate + pip install --progress-bar off -e git+https://github.com/plotly/dash.git@dev#egg=dash[dev,testing] pip install --progress-bar off --no-cache-dir -r dev-requirements.txt - git clone --depth 1 https://github.com/plotly/dash.git dash-main - pip install --progress-bar off -e ./dash-main[dev,testing] - save_cache: key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "dev-requirements.txt" }} paths: From 7ef907368ec46b1fc51477247b9e33e49fd17ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Tue, 2 Jun 2020 16:48:28 -0400 Subject: [PATCH 7/7] remove flake8 --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d3f6c62c..31961700a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,6 @@ jobs: command: | . venv/bin/activate set -eo pipefail - flake8 --version npm ci npm run lint - run: