diff --git a/.circleci/config.yml b/.circleci/config.yml index 590de56ea6..c810018004 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,7 +61,7 @@ jobs: steps: - checkout - run: sudo apt install python-pip - - run: sudo pip install -r requirements_bundles.txt + - run: sudo pip install -r requirements_bundles.txt -r requirements.txt - run: npm install - run: npm run bundle - run: npm test @@ -72,7 +72,7 @@ jobs: steps: - checkout - run: sudo apt install python-pip - - run: sudo pip install -r requirements_bundles.txt + - run: sudo pip install -r requirements_bundles.txt -r requirements.txt - run: npm install - run: .circleci/update_version - run: npm run bundle @@ -87,7 +87,8 @@ jobs: steps: - setup_remote_docker - checkout - - run: sudo pip install -r requirements_bundles.txt + - run: sudo apt install python-pip npm + - run: sudo pip install -r requirements_bundles.txt -r requirements.txt - run: .circleci/update_version "master" - run: npm run bundle - run: .circleci/docker_build "master" @@ -97,7 +98,8 @@ jobs: steps: - setup_remote_docker - checkout - - run: sudo pip install -r requirements_bundles.txt + - run: sudo apt install python-pip npm + - run: sudo pip install -r requirements_bundles.txt -r requirements.txt - run: .circleci/update_version "rc" - run: npm run bundle - run: .circleci/docker_build "rc" @@ -107,7 +109,8 @@ jobs: steps: - setup_remote_docker - checkout - - run: sudo pip install -r requirements_bundles.txt + - run: sudo apt install python-pip npm + - run: sudo pip install -r requirements_bundles.txt -r requirements.txt - run: .circleci/update_version "$CIRCLE_TAG" - run: npm run bundle - run: .circleci/docker_build "$CIRCLE_TAG" diff --git a/package.json b/package.json index 8d7ca7f5c2..d4c2d52291 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "start": "node --max-http-header-size=16385 ./node_modules/webpack-dev-server/bin/webpack-dev-server.js", - "bundle": "bin/bundle-extensions", + "bundle": "PYTHONPATH=. bin/bundle-extensions", "clean": "rm -rf ./client/dist/", "build": "npm run clean && NODE_ENV=production node --max-old-space-size=4096 node_modules/.bin/webpack", "watch": "webpack --watch --progress --colors -d", diff --git a/requirements.txt b/requirements.txt index 24356b9a43..77648dcedf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -61,6 +61,7 @@ disposable-email-domains # It is not included by default because of the GPL license conflict. # ldap3==2.2.4 gevent==1.4.0 +redash-stmo>=2019.6.0 # Install the dependencies of the bin/bundle-extensions script here. # It has its own requirements file to simplify the frontend client build process diff --git a/requirements_bundles.txt b/requirements_bundles.txt index 9b871f411d..9060a3e928 100644 --- a/requirements_bundles.txt +++ b/requirements_bundles.txt @@ -7,3 +7,4 @@ importlib-metadata==0.9 # remove when on 3.8 importlib_resources==1.0.2 # remove when on 3.7 pathlib2==2.3.3 # remove when on 3.x +