Skip to content

Commit

Permalink
Merge pull request #289 from menkej/fix-286
Browse files Browse the repository at this point in the history
Fix 286
  • Loading branch information
menkej authored Jan 15, 2021
2 parents 8cfe0ce + 5af62aa commit 047f0aa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.release
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
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 && \
if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \
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 \
Expand Down
7 changes: 6 additions & 1 deletion scripts/test
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 047f0aa

Please sign in to comment.