Skip to content

Commit 7eae484

Browse files
author
hanlucen
committed
chore(deps): update all deps to the latest version
1 parent ab05287 commit 7eae484

5 files changed

Lines changed: 32 additions & 27 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ vendor/
4343

4444
# generated bintray scripts during ci
4545
client/_scripts/ci/bintray-ci.json
46+
.idea

rootfs/Dockerfile.test

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ FROM python:3.7-alpine
33
COPY requirements.txt /app/requirements.txt
44
COPY dev_requirements.txt /app/dev_requirements.txt
55

6-
ENV PGDATA /var/lib/postgresql/11
6+
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
7+
&& apk update \
8+
&& apk add postgresql==12.3-r2
9+
10+
ENV PGDATA /var/lib/postgresql/12
711
RUN mkdir -p /run/postgresql $PGDATA \
812
&& chown -R postgres:postgres /run/postgresql $PGDATA \
913
&& apk add --update --virtual .build-deps \
@@ -12,8 +16,8 @@ RUN mkdir -p /run/postgresql $PGDATA \
1216
libffi-dev \
1317
musl-dev \
1418
openldap-dev \
15-
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
16-
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/dev_requirements.txt \
19+
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt -i https://mirrors.aliyun.com/pypi/simple \
20+
&& pip3 install --disable-pip-version-check --no-cache-dir -r /app/dev_requirements.txt -i https://mirrors.aliyun.com/pypi/simple \
1721
&& runDeps="$( \
1822
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
1923
| tr ',' '\n' \

rootfs/api/models/certificate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def save(self, *args, **kwargs):
149149
self.subject = '/' + '/'.join('%s=%s' % (key.decode(encoding='UTF-8'), value.decode(encoding='UTF-8')) for key, value in subject) # noqa
150150

151151
# public fingerprint of certificate
152-
self.fingerprint = certificate.digest('sha256')
152+
self.fingerprint = certificate.digest('sha256').decode()
153153

154154
# SubjectAltName from the certificate - return a list
155155
self.san = get_subj_alt_name(certificate)

rootfs/dev_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# test module
2-
test
2+
# test
33
# Run "make test-unit" for the % of code exercised during tests
44
coverage==4.4.1
55

rootfs/requirements.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Drycc controller requirements
2-
backoff==1.4.3
3-
django==1.11.29
4-
django-auth-ldap==1.2.15
5-
django-cors-middleware==1.3.1
6-
django-guardian==1.4.9
7-
djangorestframework==3.9.4
8-
docker==3.7.2
9-
gunicorn==19.9.0
10-
idna==2.6
11-
jmespath==0.9.3
12-
jsonfield==2.0.2
13-
jsonschema==2.6.0
14-
morph==0.1.2
15-
ndg-httpsclient==0.4.2
16-
packaging==16.8
17-
pyasn1==0.3.2
18-
psycopg2-binary==2.7.5
19-
pyldap==2.4.37
20-
pyOpenSSL==17.5.0
21-
pytz==2017.2
22-
requests==2.20.0
23-
requests-toolbelt==0.8.0
2+
backoff==1.10.0
3+
django==2.2.14
4+
django-auth-ldap==2.2.0
5+
django-cors-middleware==1.5.0
6+
django-guardian==2.3.0
7+
djangorestframework==3.11.0
8+
docker==4.2.2
9+
gunicorn==20.0.4
10+
idna==2.10
11+
jmespath==0.10.0
12+
jsonfield==3.1.0
13+
jsonschema==3.2.0
14+
morph==0.1.4
15+
ndg-httpsclient==0.5.1
16+
packaging==20.4
17+
pyasn1==0.4.8
18+
psycopg2-binary==2.8.5
19+
pyldap==3.0.0.post1
20+
pyOpenSSL==19.1.0
21+
pytz==2020.1
22+
requests==2.24.0
23+
requests-toolbelt==0.9.1

0 commit comments

Comments
 (0)