Skip to content

Commit 4b93ef0

Browse files
committed
chore(controller): upgrade new require
1 parent a2e8044 commit 4b93ef0

5 files changed

Lines changed: 31 additions & 29 deletions

File tree

rootfs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM registry.drycc.cc/drycc/base:bullseye
33
ENV DRYCC_UID=1001 \
44
DRYCC_GID=1001 \
55
DRYCC_HOME_DIR=/workspace \
6-
PYTHON_VERSION="3.10.4"
6+
PYTHON_VERSION="3.10.6"
77

88
RUN groupadd drycc --gid ${DRYCC_GID} \
99
&& useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}

rootfs/Dockerfile.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ COPY requirements.txt ${DRYCC_HOME_DIR}/requirements.txt
66
COPY dev_requirements.txt ${DRYCC_HOME_DIR}/dev_requirements.txt
77

88
ENV PGDATA="/opt/drycc/postgresql/data" \
9-
PYTHON_VERSION="3.10.4" \
10-
REDIS_VERSION="6.2.6" \
11-
RABBITMQ_VERSION="3.9.14" \
12-
POSTGRES_VERSION="14.2" \
9+
PYTHON_VERSION="3.10.6" \
10+
REDIS_VERSION="7.0.4" \
11+
RABBITMQ_VERSION="3.10.7" \
12+
POSTGRES_VERSION="14.5" \
1313
GOSU_VERSION="1.14"
1414

1515
RUN buildDeps='gcc rustc cargo libffi-dev musl-dev openssl'; \

rootfs/api/models/config.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,10 @@ def _migrate_legacy_healthcheck(self):
8282
self.values = {k: v for k, v in self.values.items() if not k.startswith('HEALTHCHECK_')}
8383

8484
def get_healthcheck(self):
85-
if('livenessProbe' in self.healthcheck.keys() or
86-
'readinessProbe' in self.healthcheck.keys()):
85+
if (
86+
'livenessProbe' in self.healthcheck.keys() or
87+
'readinessProbe' in self.healthcheck.keys()
88+
):
8789
return {'web/cmd': self.healthcheck}
8890
return self.healthcheck
8991

rootfs/dev_requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# test module
22
# test
33
# Run "make test-unit" for the % of code exercised during tests
4-
coverage==5.3
4+
coverage==6.4.4
55

66
# Run "make test-style" to check python syntax and style
7-
flake8==3.8.3
7+
flake8==5.0.4
88

99
# code coverage report at https://codecov.io/github/drycc/controller
10-
codecov==2.1.9
10+
codecov==2.1.12
1111

1212
# mock out python-requests, mostly k8s
13-
requests-mock==1.8.0
13+
requests-mock==1.9.3
1414

1515
# tail a log and pipe into tbgrep to find all tracebacks
1616
tbgrep==0.3.0

rootfs/requirements.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
# Drycc controller requirements
2-
backoff==1.11.1
2+
backoff==2.1.2
33
django==4.1
44
channels==3.0.5
55
aiohttp==v3.8.1
6-
django-cors-headers==3.7.0
6+
django-cors-headers==3.13.0
77
django-guardian==2.4.0
8-
djangorestframework==3.12.4
9-
docker==5.0.0
8+
djangorestframework==3.13.1
9+
docker==6.0.0
1010
gunicorn==20.1.0
11-
uvicorn[standard]==0.18.2
11+
uvicorn[standard]==0.18.3
1212
asgiref==3.5.2
13-
idna==3.2
14-
jmespath==0.10.0
15-
jsonschema==3.2.0
16-
morph==0.1.4
17-
ndg-httpsclient==0.5.1
18-
packaging==21.0
13+
idna==3.3
14+
jmespath==1.0.1
15+
jsonschema==4.14.0
16+
morph==0.1.5
17+
packaging==21.3
1918
pyasn1==0.4.8
2019
psycopg2-binary==2.9.3
21-
pyOpenSSL==20.0.1
20+
pyOpenSSL==22.0.0
21+
ndg-httpsclient==0.5.1
2222
pytz==2022.2.1
23-
requests==2.26.0
23+
requests==2.28.1
2424
requests-toolbelt==0.9.1
25-
celery==5.2.2
25+
celery==5.2.7
2626
hiredis==2.0.0
27-
django_redis==5.0.0
28-
influxdb-client==1.19.0
29-
dj-database-url==0.5.0
27+
django_redis==5.2.0
28+
influxdb-client==1.32.0
29+
dj-database-url==1.0.0
3030
social-auth-app-django==5.0.0
3131
python-jose==3.3.0
32-
Authlib==0.15.4
32+
Authlib==1.0.1
3333
kubernetes==24.2.0

0 commit comments

Comments
 (0)