From 6c2a7e76b7b6779ccc501dd2608e1f6fc78d4756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Menke?= Date: Fri, 15 Jan 2021 21:22:25 +0100 Subject: [PATCH 1/2] fix warning for missing tzinfo in Docker image --- CHANGELOG.md | 2 ++ Dockerfile.release | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8099791f..bfd8d7198 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## Unreleased - fix: smtp server_hostname cannot be an empty [#227](https://github.com/icloud-photos-downloader/icloud_photos_downloader/issues/227) +- fix: Warning for missing `tzinfo` in Docker image removed by adding `tzinfo`-package. +[#286](https://github.com/icloud-photos-downloader/icloud_photos_downloader/pull/286) ## 1.7.1 (2020-11-15) diff --git a/Dockerfile.release b/Dockerfile.release index 5d6415406..e53a1d99f 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -1,7 +1,7 @@ FROM alpine:latest RUN set -xe && \ - apk add --no-cache python3 && \ + apk add --no-cache python3 tzdata && \ python3 -m ensurepip && \ rm -r /usr/lib/python*/ensurepip && \ pip3 install --upgrade pip setuptools && \ @@ -9,6 +9,8 @@ RUN set -xe && \ if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi && \ rm -r /root/.cache +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime + ARG ICLOUDPD_VERSION COPY dist/* /tmp RUN set -xe \ From 5af62aa524908377c93a63355c7046a095210e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Menke?= Date: Fri, 15 Jan 2021 21:34:13 +0100 Subject: [PATCH 2/2] add possibility to limit multithreaded test run --- scripts/test | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/test b/scripts/test index 39a5f223d..8cdc02184 100755 --- a/scripts/test +++ b/scripts/test @@ -6,9 +6,14 @@ realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}" } +if [ $# -gt 0 ] ; then + numprocesses=$1 +else + numprocesses='auto' +fi CURRENT_DIR=$(dirname "$0") ROOT_DIR="$(realpath $(dirname "$0")/..)" echo "Running tests with Python 3... (HTML coverage report)" cd $ROOT_DIR -python3 -m pytest --cov=icloudpd --cov-report html --cov-report term-missing --numprocesses auto +python3 -m pytest --cov=icloudpd --cov-report html --cov-report term-missing --numprocesses $numprocesses