bump libraries

neuroforgede · Nov 10, 2023 · a34c2f6 · a34c2f6
1 parent a9e7212
commit a34c2f6
Show file tree

Hide file tree

Showing 7 changed files with 365 additions and 320 deletions.
diff --git a/skipper/Dockerfile-base b/skipper/Dockerfile-base
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
 RUN sudo apt-get upgrade -y
 
 RUN pip install --upgrade setuptools pip
-RUN pip install pipenv==2023.2.18
+RUN pip install pipenv==2023.10.24
 ENV PIPENV_IGNORE_VIRTUALENVS=1
 
 RUN useradd -rm -d /home/skipper -s /bin/bash -g root -G sudo -u 9999 skipper

diff --git a/skipper/Dockerfile-base-arm b/skipper/Dockerfile-base-arm
@@ -10,8 +10,8 @@ FROM python:3.11
 RUN apt-get update && apt-get install -y sudo vim python3-virtualenv python3-setuptools
 RUN sudo apt-get upgrade -y
 
-RUN pip install --upgrade pip==23.0.1
-RUN pip install pipenv==2022.8.17
+RUN pip install --upgrade pip==23.3.1
+RUN pip install pipenv==2023.10.24
 ENV PIPENV_IGNORE_VIRTUALENVS=1
 
 RUN useradd -rm -d /home/skipper -s /bin/bash -g root -G sudo -u 9999 skipper

diff --git a/skipper/Dockerfile-base-dev b/skipper/Dockerfile-base-dev
@@ -22,9 +22,9 @@ RUN apt-get update && apt-get install -y \
 	cargo \
 	pkg-config
 
-RUN pip install setuptools==67.3.2
-RUN pip install --upgrade pip==23.0.1
-RUN pip install pipenv==2023.2.18
+RUN pip install setuptools==68.2.2
+RUN pip install --upgrade pip==23.3.1
+RUN pip install pipenv==2023.10.24
 ENV PIPENV_IGNORE_VIRTUALENVS=1
 ENV PIPENV_VENV_IN_PROJECT=1
 

diff --git a/skipper/Pipfile b/skipper/Pipfile
@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-setuptools = "==67.3.2"
+setuptools = "==68.2.2"
 djangorestframework = "==3.14.0"
 djangorestframework-simplejwt = { version = "==5.2.2" }
 # at least required for simplejwt crypto
@@ -59,15 +59,15 @@ opentelemetry-instrumentation-botocore = "==0.41b0"
 opentelemetry-instrumentation-psycopg2 = "==0.41b0"
 opentelemetry-instrumentation-redis = "==0.41b0"
 sqlparse = "==0.4.4"
-Django = "==4.2.6"
+Django = "==4.2.7"
 Pillow = "==10.0.1"
 FormEncode = "==2.0.1"
 SQLAlchemy = "==1.4.41"
 Deprecated = "==1.2.13"
 protobuf = "==3.20.2"
 wheel = "0.38.4"
 certifi = "==2023.7.22"
-pip = "==23.0.1"
+pip = "==23.3.1"
 
 [dev-packages]
 pylint-django = "==2.0.13"

diff --git a/skipper/Pipfile.lock b/skipper/Pipfile.lock
diff --git a/skipper/skipper/dataseries/storage/dynamic_sql/storage_view_adapter.py b/skipper/skipper/dataseries/storage/dynamic_sql/storage_view_adapter.py
@@ -211,6 +211,8 @@ def raw_display_data_point_query(
         resolve_dimension_external_ids=external_id_as_dimension_identifier,
         data_series_query_info=data_series_query_info
     )
+
+    print(query_str)
 
     raw = DisplayDataPoint.objects\
         .raw(

diff --git a/skipper/skipper/environment_local.py b/skipper/skipper/environment_local.py
@@ -18,7 +18,7 @@
         'SKIPPER_INSTALLATION_NAME': 'localhost',
         'SKIPPER_DJANGO_SECRET_KEY': 't#oin*ss-y%q9!qh)dl#suaof2cl65e3f#q^m&rvtcznogu3ox',
         'SKIPPER_DOMAIN': 'localhost',
-        'SKIPPER_S3_ENDPOINT_URL': 'http://localhost:' + os.getenv('SEAWEEDFS_DEV_OUTSIDE_PORT', '8000'),
+        'SKIPPER_S3_ENDPOINT_URL': 'http://localhost:' + os.getenv('SEAWEEDFS_DEV_OUTSIDE_PORT', '8001'),
         'SKIPPER_TASK_DASHBOARD_ENABLED': 'true',
         'SKIPPER_OTEL_JAEGER_UI_ENABLED': 'true',
         "SKIPPER_DB_USER": 'cephalopod',