diff --git a/docker/pythonpath_dev/superset_config.py b/docker/pythonpath_dev/superset_config.py index 7bfe2012c2..6ea9abf63c 100644 --- a/docker/pythonpath_dev/superset_config.py +++ b/docker/pythonpath_dev/superset_config.py @@ -70,7 +70,7 @@ REDIS_RESULTS_DB = get_env_variable("REDIS_RESULTS_DB", "1") RESULTS_BACKEND = FileSystemCache("/app/superset_home/sqllab") CACHE_CONFIG = { - "CACHE_TYPE": "redis", + "CACHE_TYPE": "RedisCache", "CACHE_DEFAULT_TIMEOUT": 300, "CACHE_KEY_PREFIX": "superset_", "CACHE_REDIS_HOST": REDIS_HOST, diff --git a/docs/docs/installation/running-on-kubernetes.mdx b/docs/docs/installation/running-on-kubernetes.mdx index 61fa84721b..18ab85bebd 100644 --- a/docs/docs/installation/running-on-kubernetes.mdx +++ b/docs/docs/installation/running-on-kubernetes.mdx @@ -141,8 +141,7 @@ connect to those datasources in your Superset installation: ```yaml bootstrapScript: | #!/bin/bash - pip install psycopg2==2.9.1 \ - redis==3.2.1 \ + pip install psycopg2==2.9.6 \ sqlalchemy-bigquery==1.5.0 \ elasticsearch-dbapi==0.2.5 &&\ if [ ! -f ~/bootstrap ]; then echo "Running Superset with uid {{ .Values.runAsUser }}" > ~/bootstrap; fi diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml index b7c5f6c08c..bff2f90276 100644 --- a/helm/superset/Chart.yaml +++ b/helm/superset/Chart.yaml @@ -29,7 +29,7 @@ maintainers: - name: craig-rueda email: craig@craigrueda.com url: https://github.com/craig-rueda -version: 0.9.2 +version: 0.9.3 dependencies: - name: postgresql version: 12.1.6 diff --git a/helm/superset/README.md b/helm/superset/README.md index 016bff992e..9a6c334c3b 100644 --- a/helm/superset/README.md +++ b/helm/superset/README.md @@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs # superset -![Version: 0.9.2](https://img.shields.io/badge/Version-0.9.2-informational?style=flat-square) +![Version: 0.9.3](https://img.shields.io/badge/Version-0.9.3-informational?style=flat-square) Apache Superset is a modern, enterprise-ready business intelligence web application diff --git a/helm/superset/templates/_helpers.tpl b/helm/superset/templates/_helpers.tpl index 67f018095d..f3fd51b178 100644 --- a/helm/superset/templates/_helpers.tpl +++ b/helm/superset/templates/_helpers.tpl @@ -69,7 +69,7 @@ def env(key, default=None): MAPBOX_API_KEY = env('MAPBOX_API_KEY', '') CACHE_CONFIG = { - 'CACHE_TYPE': 'redis', + 'CACHE_TYPE': 'RedisCache', 'CACHE_DEFAULT_TIMEOUT': 300, 'CACHE_KEY_PREFIX': 'superset_', 'CACHE_REDIS_HOST': env('REDIS_HOST'), diff --git a/requirements/base.txt b/requirements/base.txt index a8a61ef6e6..0a33597717 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -13,6 +13,8 @@ amqp==5.1.0 # via kombu apispec[yaml]==3.3.2 # via flask-appbuilder +async-timeout==4.0.2 + # via redis attrs==21.2.0 # via jsonschema babel==2.9.1 @@ -251,7 +253,7 @@ pyyaml==5.4.1 # via # apache-superset # apispec -redis==3.5.3 +redis==4.5.4 # via apache-superset rich==13.3.1 # via flask-limiter diff --git a/requirements/development.txt b/requirements/development.txt index aa92fcfda4..3cdde5d623 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -70,7 +70,7 @@ pillow==9.3.0 # via apache-superset progress==1.6 # via -r requirements/development.in -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.6 # via apache-superset ptyprocess==0.7.0 # via pexpect diff --git a/requirements/docker.txt b/requirements/docker.txt index 0338f43fd8..fb920773b7 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -14,7 +14,7 @@ gevent==21.8.0 # via -r requirements/docker.in greenlet==1.1.3.post0 # via gevent -psycopg2-binary==2.9.5 +psycopg2-binary==2.9.6 # via apache-superset zope-event==4.5.0 # via gevent diff --git a/setup.py b/setup.py index c63bd21042..0d7bf1aed8 100644 --- a/setup.py +++ b/setup.py @@ -113,7 +113,7 @@ setup( "pyarrow>=10.0.1, <11", "pyyaml>=5.4", "PyJWT>=2.4.0, <3.0", - "redis", + "redis>=4.5.4, <5.0", "selenium>=3.141.0", "shortid", "sshtunnel>=0.4.0, <0.5", @@ -170,7 +170,7 @@ setup( ], "oracle": ["cx-Oracle>8.0.0, <8.1"], "pinot": ["pinotdb>=0.3.3, <0.4"], - "postgres": ["psycopg2-binary==2.9.5"], + "postgres": ["psycopg2-binary==2.9.6"], "presto": ["pyhive[presto]>=0.6.5"], "trino": ["trino>=0.319.0"], "prophet": ["prophet>=1.0.1, <1.1", "pystan<3.0"],