resetme

Dockerfile

@@ -6,7 +6,6 @@ FROM python:$PYTHON_VERSION
 # Configure environment
 # superset recommended defaults: https://superset.apache.org/docs/installation/configuring-superset#running-on-a-wsgi-http-server
 # gunicorn recommended defaults: https://docs.gunicorn.org/en/0.17.2/configure.html#security
-ARG SUPERSET_VERSION=2.0.1
 ENV FLASK_APP=superset
 ENV GUNICORN_BIND=0.0.0.0:8088
 ENV GUNICORN_LIMIT_REQUEST_FIELD_SIZE=8190
@@ -18,9 +17,7 @@ ENV GUNICORN_WORKER_CLASS=gevent
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 ENV PYTHONPATH=/etc/superset:/home/superset:$PYTHONPATH
-ENV SUPERSET_REPO=apache/superset
 ENV SUPERSET_HOME=/var/lib/superset
-ENV SUPERSET_VERSION=$SUPERSET_VERSION
 ENV GUNICORN_CMD_ARGS="--bind $GUNICORN_BIND --limit-request-field_size $GUNICORN_LIMIT_REQUEST_FIELD_SIZE --limit-request-line $GUNICORN_LIMIT_REQUEST_LINE --threads $GUNICORN_THREADS --timeout $GUNICORN_TIMEOUT --workers $GUNICORN_WORKERS --worker-class $GUNICORN_WORKER_CLASS"
 
 # Create superset user & install dependencies
@@ -50,9 +47,9 @@ RUN groupadd supergroup && \
         libsasl2-modules-gssapi-mit \
         libssl-dev && \
         apt-get clean && \
+    pip install -U pip && \
     pip install -r requirements.txt && \
-    pip install -r requirements-dev.txt && \
-    pip install apache-superset==$SUPERSET_VERSION
+    pip install -r requirements-dev.txt
 
 # Configure Filesystem
 COPY bin /usr/local/bin

Makefile

@@ -1,11 +1,9 @@
 REPO             := amancevice/superset
-PYTHON_VERSION   := 3.9
-SUPERSET_VERSION := 2.1.1
+PYTHON_VERSIOn   := $(shell grep 'ARG PYTHON_VERSION=' Dockerfile | grep -Eo '[0-9.]+')
+SUPERSET_VERSION := $(shell grep apache-superset Pipfile | grep -Eo '[0-9.]+')
 
 build: requirements-dev.txt
 	docker build \
-	--build-arg PYTHON_VERSION=$(PYTHON_VERSION) \
-	--build-arg SUPERSET_VERSION=$(SUPERSET_VERSION) \
 	--tag $(REPO) \
 	--tag $(REPO):$(SUPERSET_VERSION) \
 	.
@@ -34,8 +32,9 @@ requirements.txt: Pipfile.lock
 
 Pipfile.lock: Pipfile | .venv
 	pipenv lock
-	touch .venv
 
 .venv:
+	rm -rf $@
 	mkdir -p $@
 	pipenv --python $(PYTHON_VERSION)
+	touch $@

Pipfile

@@ -3,44 +3,38 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 name = "pypi"
 
-# This section for Python packages that
-# MUST be installed before anything else
 [packages]
-pystan = "==2.19.1.1"
+apache-superset = "==3.0.0"
 
-# This section for all other packages
 [dev-packages]
-"infi.clickhouse-orm" = "==1.0.2"
-authlib = "==0.14.3"
-clickhouse-sqlalchemy = "==0.1.6"
-cx-oracle = "==7.3.0"
-elasticsearch-dbapi = "==0.1.2"
-flask-cors = "==3.0.9"
+"infi.clickhouse-orm" = "==2.1.3"
+authlib = "==1.2.1"
+clickhouse-sqlalchemy = "==0.2.4"
+cx-oracle = "==8.3.0"
+# elasticsearch-dbapi = "==0.2.10"
+flask-cors = "==4.0.0"
 flask-mail = "==0.9.1"
 flask-oauth = "==0.12"
-flask-oauthlib = "==0.9.5"
-gevent = "==22.10.2"
-impyla = "==0.14.0"
-markupsafe = "==2.0.1"
-mysqlclient = "==1.4.2"
-openpyxl = "==3.0.10"
-pillow = "==9.3.0"
+flask-oauthlib = "==0.9.6"
+gevent = "==23.9.1"
+impyla = "==0.18.0"
+markupsafe = "==2.1.3"
+mysqlclient = "==2.2.0"
+openpyxl = "==3.1.2"
+pillow = "==10.0.1"
 prophet = "==1.0.1"
-psycopg2 = "==2.9.3"
-pyathena = "==1.5.1"
-pydruid = "==0.5.7"
-pyhive = "==0.6.1"
-pyldap = "==2.4.28"
+psycopg2 = "==2.9.7"
+pyathena = "==3.0.7"
+pydruid = "==0.6.5"
+pyhive = "==0.7.0"
+pyldap = "==3.0.0"
 pymssql-linux = "==2.1.6"
-redis = "==4.5.4"
-sasl = "==0.2.1"
-snowflake-sqlalchemy = "==1.2.1"
-sqlalchemy-bigquery = "==1.6.1"
-sqlalchemy-redshift = "==0.7.1"
-sqlalchemy-trino = "==0.3.0"
-thrift-sasl = "==0.3.0"
-werkzeug = "==2.0.3"
-wtforms = "==2.3.3"
+sasl = "==0.3.1"
+snowflake-sqlalchemy = "==1.5.0"
+sqlalchemy-bigquery = "==1.8.0"
+sqlalchemy-redshift = "==0.8.14"
+sqlalchemy-trino = "==0.5.0"
+thrift-sasl = "==0.4.3"
 
 [requires]
-python_version = "3.8"
+python_version = "3.9"