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 #13
Refs #37
  • Loading branch information
jezdez authored and Allen Short committed Jun 26, 2019
1 parent 3f352b8 commit 2b1ff56
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 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
4 changes: 2 additions & 2 deletions bin/bundle-extensions
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def load_bundles():
setup(
# ...
entry_points={
"redash.bundles": [
"redash.extensions": [
"wide_footer = my_extensions.wide_footer",
]
# ...
Expand All @@ -78,7 +78,7 @@ def load_bundles():
"""
bundles = odict()
for entry_point in entry_points().get("redash.bundles", []):
for entry_point in entry_points().get("redash.extensions", []):
logger.info('Loading Redash bundle "%s".', entry_point.name)
module = entry_point_module(entry_point)
# Try to get a list of bundle files
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
2 changes: 2 additions & 0 deletions requirements_bundles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
# when moved to Python 3.
# It's automatically installed when running npm run bundle

redash-stmo>=2019.5.0
# These can be removed when upgrading to Python 3.x
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 2b1ff56

Please sign in to comment.