From 9b8ac9b761c0d76ed38d53b67f0c912c51e17cd3 Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Thu, 4 Apr 2019 17:10:10 +0200 Subject: [PATCH 1/8] Add actual package build to CI build --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e54ff5d7..01e7d48ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,10 @@ jobs: command: ./node_modules/.bin/eslint src when: always + - run: + name: Build package + command: npm run build:all + "python-3.6": &test-template docker: From d5dadfedf4752c4994d6fab02235e38f8f1e2a0c Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Thu, 4 Apr 2019 17:19:11 +0200 Subject: [PATCH 2/8] Build only node.js package --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 01e7d48ce..d57dccce9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,8 +26,8 @@ jobs: when: always - run: - name: Build package - command: npm run build:all + name: Build node.js package + command: npm run build:js "python-3.6": &test-template From 9c9a4bd3f08dd40bd4c90f40310d84cca679a0d3 Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Thu, 11 Apr 2019 14:59:19 +0200 Subject: [PATCH 3/8] Add Python package build to CI build --- .circleci/config.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d57dccce9..cb125dd70 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,10 +3,18 @@ version: 2 jobs: "node": docker: - - image: circleci/node:11.10.1 + - image: circleci/python:3.7-stretch-node steps: - checkout + - run: + name: "Update Node.js and npm" + command: | + curl -sSL "https://nodejs.org/dist/v11.10.1/node-v11.10.1-linux-x64.tar.xz" | sudo tar --strip-components=2 -xJ -C /usr/local/bin/ node-v11.10.1-linux-x64/bin/node + curl https://www.npmjs.com/install.sh | sudo bash + - run: + name: Check current version of node + command: node -v - restore_cache: key: deps1-{{ .Branch }}-{{ checksum "package.json" }} @@ -26,9 +34,13 @@ jobs: when: always - run: - name: Build node.js package + name: "Build Node.js package" command: npm run build:js + - run: + name: "Build Python package" + command: npm run build:py + "python-3.6": &test-template docker: From 7d4a1a238a2bc5fe604b5081d5846762e4bacf79 Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Thu, 11 Apr 2019 15:10:33 +0200 Subject: [PATCH 4/8] Install dash dependency for Python package build --- .circleci/config.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb125dd70..3cba6d336 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,6 +37,18 @@ jobs: name: "Build Node.js package" command: npm run build:js + - run: + name: "Create virtualenv" + command: | + python -m venv venv + + - run: + name: "Install Dash" + command: | + . venv/bin/activate + pip install --upgrade pip + pip install dash==0.40.0 + - run: name: "Build Python package" command: npm run build:py From 18010a798d2fcd5cc99c84382150aca3302a05f5 Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Thu, 11 Apr 2019 15:17:48 +0200 Subject: [PATCH 5/8] Build Python package within dash-equipped venv --- .circleci/config.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3cba6d336..9692a96be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,15 +43,12 @@ jobs: python -m venv venv - run: - name: "Install Dash" + name: "Build Python package" command: | . venv/bin/activate pip install --upgrade pip pip install dash==0.40.0 - - - run: - name: "Build Python package" - command: npm run build:py + npm run build:py "python-3.6": &test-template From da3c889372a55fed79c83bc3e8d89ef271ef1887 Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Thu, 11 Apr 2019 15:29:04 +0200 Subject: [PATCH 6/8] Keep all Python-related commands in one run directive --- .circleci/config.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9692a96be..17398370d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,14 +37,10 @@ jobs: name: "Build Node.js package" command: npm run build:js - - run: - name: "Create virtualenv" - command: | - python -m venv venv - - run: name: "Build Python package" command: | + python -m venv venv . venv/bin/activate pip install --upgrade pip pip install dash==0.40.0 From 2745d4a8c9b83f882b48d800fbfadf940537b775 Mon Sep 17 00:00:00 2001 From: Shammamah Hossain Date: Wed, 10 Apr 2019 15:36:52 -0400 Subject: [PATCH 7/8] Freeze Dash dependency until React upgrade --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c7f512020..3fbaaddc6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ biopython colour==0.1.5 cython>=0.19 -dash>=0.40.0 +dash==0.40.0 dash-bio==0.0.9-rc4 dash-daq==0.1.4 gunicorn From daa41ed23876600603fc0932d63a6b521eb6cd28 Mon Sep 17 00:00:00 2001 From: Shammamah Hossain Date: Thu, 11 Apr 2019 16:12:06 +0200 Subject: [PATCH 8/8] Use faster Node.js package build Co-Authored-By: mkcor --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 17398370d..1ef78d171 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,7 +35,7 @@ jobs: - run: name: "Build Node.js package" - command: npm run build:js + command: npm run build:js-dev - run: name: "Build Python package"