From c644c725074143b63771450aedff06406c4365f5 Mon Sep 17 00:00:00 2001 From: Craig Date: Mon, 23 Mar 2020 15:48:49 -0700 Subject: [PATCH 1/2] Adding requirements-local.txt support --- .gitignore | 2 ++ Dockerfile | 5 +++-- docker/README.md | 12 ++++++++++++ superset-frontend/package-lock.json | 15 ++++++++++----- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d069eef065eac..0ccddfa4f61be 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,5 @@ apache-superset-*.tar.gz* # Translation binaries messages.mo + +docker/requirements-local.txt diff --git a/Dockerfile b/Dockerfile index 9f14b07aaaa65..a10fcfe267829 100644 --- a/Dockerfile +++ b/Dockerfile @@ -114,9 +114,10 @@ ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] ###################################################################### FROM lean AS dev -COPY ./requirements-dev.txt ./docker/requirements-extra.txt /app/ +COPY ./requirements-dev.txt ./docker/requirements* /app/ USER root RUN cd /app \ - && pip install --no-cache -r requirements-dev.txt -r requirements-extra.txt + && pip install --no-cache -r requirements-dev.txt -r requirements-extra.txt \ + && pip install --no-cache -r requirements-local.txt || true USER superset diff --git a/docker/README.md b/docker/README.md index 62a97aa242461..caed1a7b03566 100644 --- a/docker/README.md +++ b/docker/README.md @@ -37,6 +37,18 @@ intended for use with local development. In order to override configuration settings locally, simply make a copy of [./docker/pythonpath/superset_config_local.example](./docker/pythonpath/superset_config_local.example) into [./docker/pythonpath/superset_config_docker.py](./docker/pythonpath/superset_config_docker.py) (git ignored) and fill in your overrides. +### Local packages + +If you want to add python packages in order to test things like DBs locally, you can simply add a local requirements.txt (./docker/requirements-local.txt) +and rebuild your docker stack. + +Steps: + 1. Create ./docker/requirements-local.txt + 2. Add your new packages + 3. Rebuild docker-compose + a. `docker-compose down -v` + b. `docker-compose up` + ## Initializing Database The DB will initialize itself upon startup via the init container (superset-init) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index dc63e0d3c2e8c..7ecf8ab5f76bb 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -10815,7 +10815,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -11929,7 +11930,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -15982,7 +15984,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -16852,7 +16855,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -32115,7 +32119,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, From bd09f03a930a5361e405770551320c1fa7994e1d Mon Sep 17 00:00:00 2001 From: Craig Date: Mon, 23 Mar 2020 16:09:55 -0700 Subject: [PATCH 2/2] Reverting package-lock.json --- superset-frontend/package-lock.json | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index 7ecf8ab5f76bb..dc63e0d3c2e8c 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -10815,8 +10815,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "resolved": "" } } }, @@ -11930,8 +11929,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true, "optional": true } @@ -15984,8 +15982,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "resolved": "" } } }, @@ -16855,8 +16852,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true, "optional": true } @@ -32119,8 +32115,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "resolved": "" } } },