From 2fb0bb809683c72b80799a27e77e3b45252af8d2 Mon Sep 17 00:00:00 2001 From: Dineshkarthik Date: Tue, 6 Aug 2019 16:22:07 +0200 Subject: [PATCH 1/4] add: CI testing --- .circleci/config.yml | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..2e7d793 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,54 @@ +version: 2 + +jobs: + test-3.6: + docker: + - image: circleci/python:3.6.5 + environment: + CIRCLE_ARTIFACTS: /tmp/circleci-artifacts + CIRCLE_TEST_REPORTS: /tmp/circleci-test-results + LOG_DIR: ${CIRCLE_ARTIFACTS}/testresults/ + steps: + - checkout + - run: + name: Get setuptools + shell: /bin/bash + command: sudo pip install --upgrade pip setuptools codecov + - run: + name: Run test + shell: /bin/bash + command: | + sudo make -e test + codecov + - store_artifacts: + path: /tmp/circleci-artifacts + + test-3.7: + docker: + - image: circleci/python:3.7.3 + environment: + CIRCLE_ARTIFACTS: /tmp/circleci-artifacts + CIRCLE_TEST_REPORTS: /tmp/circleci-test-results + LOG_DIR: ${CIRCLE_ARTIFACTS}/testresults/ + steps: + - checkout + - run: + name: Get setuptools + shell: /bin/bash + command: sudo pip install --upgrade pip setuptools codecov + - run: + name: Run test + shell: /bin/bash + command: | + sudo make -e test + codecov + - store_artifacts: + path: /tmp/circleci-artifacts + + +workflows: + version: 2 + tests: + jobs: + - test-3.6 + - test-3.7 \ No newline at end of file From c49cbc679f03a0100ae84e6f195872aed960412f Mon Sep 17 00:00:00 2001 From: Dineshkarthik Date: Tue, 6 Aug 2019 16:30:13 +0200 Subject: [PATCH 2/4] enh: setting timezone to utc --- media_downloader.py | 2 +- tests/test_media_downloader.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media_downloader.py b/media_downloader.py index e2bca79..3b500e3 100644 --- a/media_downloader.py +++ b/media_downloader.py @@ -38,7 +38,7 @@ def _get_media_meta(media_obj: object, _type: str) -> Tuple[str, str]: THIS_DIR, _type, "voice_{}.{}".format( - dt.fromtimestamp(media_obj.date).isoformat(), file_format + dt.utcfromtimestamp(media_obj.date).isoformat(), file_format ), ) elif _type == "photo": diff --git a/tests/test_media_downloader.py b/tests/test_media_downloader.py index 9134ee8..ce969db 100644 --- a/tests/test_media_downloader.py +++ b/tests/test_media_downloader.py @@ -85,7 +85,7 @@ class MockClient: def download_media(self, *args, **kwargs): assert "AwADBQADbwAD2oTRVeHe5eXRFftfAg", args[0] - assert "/root/project/voice/voice_2019-07-25T16:53:50.ogg", kwargs[ + assert "/root/project/voice/voice_2019-07-25T14:53:50.ogg", kwargs[ "file_name" ] return kwargs["file_name"] @@ -108,7 +108,7 @@ class MediaDownloaderTestCase(unittest.TestCase): self.assertEqual( ( "AwADBQADbwAD2oTRVeHe5eXRFftfAg", - "/root/project/voice/voice_2019-07-25T16:53:50.ogg", + "/root/project/voice/voice_2019-07-25T14:53:50.ogg", ), result, ) From 6e92bfcf0eea8b3509f1065aea705fb737e44d95 Mon Sep 17 00:00:00 2001 From: Dineshkarthik Date: Tue, 6 Aug 2019 16:43:46 +0200 Subject: [PATCH 3/4] add: testing with python3.5 --- .circleci/config.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e7d793..2827d0e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,28 @@ version: 2 jobs: + test-3.5: + docker: + - image: circleci/python:3.6.7 + environment: + CIRCLE_ARTIFACTS: /tmp/circleci-artifacts + CIRCLE_TEST_REPORTS: /tmp/circleci-test-results + LOG_DIR: ${CIRCLE_ARTIFACTS}/testresults/ + steps: + - checkout + - run: + name: Get setuptools + shell: /bin/bash + command: sudo pip install --upgrade pip setuptools codecov + - run: + name: Run test + shell: /bin/bash + command: | + sudo make -e test + codecov + - store_artifacts: + path: /tmp/circleci-artifacts + test-3.6: docker: - image: circleci/python:3.6.5 @@ -50,5 +72,6 @@ workflows: version: 2 tests: jobs: + - test-3.5 - test-3.6 - test-3.7 \ No newline at end of file From 68da926bc45e4bf8e261a6ee8c21e0afc5bca66e Mon Sep 17 00:00:00 2001 From: Dineshkarthik Date: Tue, 6 Aug 2019 16:44:03 +0200 Subject: [PATCH 4/4] upd: badges --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5bd4ba9..ec32813 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@

Telegram Media Downloader

-License: MIT +Build Status +Coverage Status +License: MIT Code style: black