Skip to content

Commit

Permalink
Install redash-stmo.
Browse files Browse the repository at this point in the history
In the long run we'll be able to install additional dependencies by
having an own Dockerfile to build images based on the Redash image
but that installs additional Python dependencies. But until we have
a fork with lots of changes ourselves we need to do it this way.

Redash-stmo contains the ability to hook up our own Dockerflow
library.

Refs getredash#13
Refs getredash#37
  • Loading branch information
jezdez authored and Allen Short committed Jun 12, 2019
1 parent 9b3b5ec commit 5567f8b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
13 changes: 8 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions requirements_bundles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5567f8b

Please sign in to comment.