From 5b3dd75f82586affbd2befd7e20755695bdf5aaa Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 4 Jan 2022 12:20:10 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Update=20test=20output=20to=20include=20dir?= =?UTF-8?q?ector=20with=20'=C5=8D'=20in=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- testdata/expected-en.csv | 1 + testdata/expected-es.csv | 1 + 2 files changed, 2 insertions(+) diff --git a/testdata/expected-en.csv b/testdata/expected-en.csv index a5423b6..686016b 100644 --- a/testdata/expected-en.csv +++ b/testdata/expected-en.csv @@ -1,4 +1,5 @@ Title,Year,Directors,WatchedDate,Rating,Rating10 +Attack on Titan: Chronicle,2020,"Masashi Koizuka, Tetsurō Araki",2022-01-03,4.0,8 Full Metal Jacket,1987,Stanley Kubrick,2021-11-10,2.0,4 The Lion King,1994,"Rob Minkoff, Roger Allers",2021-11-10,3.5,7 Mad Max: Fury Road,2015,George Miller,2021-11-10,5.0,10 diff --git a/testdata/expected-es.csv b/testdata/expected-es.csv index 2e3eb3d..38397b9 100644 --- a/testdata/expected-es.csv +++ b/testdata/expected-es.csv @@ -1,4 +1,5 @@ Title,Year,Directors,WatchedDate,Rating,Rating10 +Shingeki no Kyojin: Chronicle,2020,"Masashi Koizuka, Tetsurō Araki",2022-01-04,4.0,8 La chaqueta metálica,1987,Stanley Kubrick,2021-11-11,2.0,4 El rey león,1994,"Rob Minkoff, Roger Allers",2021-11-11,3.5,7 Mad Max: Furia en la carretera,2015,George Miller,2021-11-11,5.0,10 From 2494f9d9fc664be04b7e3d40647f64646d6d8f98 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 4 Jan 2022 12:36:23 +0100 Subject: [PATCH 2/3] Set encoding to UTF-8 explicitly --- fa_scraper/fa_scraper.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fa_scraper/fa_scraper.py b/fa_scraper/fa_scraper.py index 7fa721d..7bdcca4 100755 --- a/fa_scraper/fa_scraper.py +++ b/fa_scraper/fa_scraper.py @@ -211,7 +211,9 @@ def save_to_csv( ): """Saves films in a csv file""" - with open(filename, "w", newline="") as csvfile: + # Set to UTF-8 to work around Windows error + # "'charmap' codec can't encode character". + with open(filename, "w", encoding="utf-8", newline="") as csvfile: writer = csv.DictWriter(csvfile, fieldnames=fieldnames) writer.writeheader() for d in dicts: From d7c91aea04635a805c087bea175c38f99a55ebe0 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 4 Jan 2022 14:01:25 +0100 Subject: [PATCH 3/3] Use csv-diff fork to specify encoding --- .github/workflows/endtoend.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/endtoend.yaml b/.github/workflows/endtoend.yaml index e0c7b73..993a755 100644 --- a/.github/workflows/endtoend.yaml +++ b/.github/workflows/endtoend.yaml @@ -25,7 +25,8 @@ jobs: - name: Install fa-scrapper run: poetry install - name: Install csv-diff - run: python3 -m pip install csv-diff + # Install csv-diff with https://github.com/simonw/csv-diff/pull/19 + run: python3 -m pip install git+https://github.com/mikecoop83/csv-diff@c3d32f758343a2ba3737d612e6e906fd9d77322b - name: Run fa-scrapper env: TEST_ACCOUNT_ID: ${{ secrets.TEST_ACCOUNT_ID }} @@ -35,5 +36,5 @@ jobs: - name: Check output env: FA_LANG: ${{ matrix.lang }} - run: csv-diff output.csv testdata/expected-${FA_LANG}.csv + run: csv-diff --encoding "utf-8" output.csv testdata/expected-${FA_LANG}.csv shell: bash