Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump libraries #71

Merged
merged 2 commits into from
Nov 10, 2023
Merged

bump libraries #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a34c2f6
bump libraries
s4ke Nov 10, 2023
b488fb1
Merge remote-tracking branch 'origin/main' into wip/django42/main
s4ke Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion skipper/Dockerfile-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions skipper/Dockerfile-base-arm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions skipper/Dockerfile-base-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions skipper/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
534 changes: 264 additions & 270 deletions skipper/Pipfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions skipper/skipper/dataseries/storage/dynamic_sql/storage_view_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion skipper/skipper/environment_local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading