From adde6ac2c21e22d1ab300dc33e585182bafa024c Mon Sep 17 00:00:00 2001 From: Nahue <nahuelhds@gmail.com> Date: Mon, 25 May 2020 19:39:07 -0300 Subject: [PATCH 1/6] Missing diff props to be able to tweet (cherry picked from commit df8256ed22a779e0292af583d9f1411bae39f8e0) --- diffengine/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/diffengine/__init__.py b/diffengine/__init__.py index 8936e65..5e62eec 100755 --- a/diffengine/__init__.py +++ b/diffengine/__init__.py @@ -298,6 +298,18 @@ class Diff(BaseModel): emailed = DateTimeField(null=True) blogged = DateTimeField(null=True) + @property + def url_changed(self): + return self.old.url != self.new.url + + @property + def title_changed(self): + return self.old.title != self.new.title + + @property + def summary_changed(self): + return self.old.summary != self.new.summary + @property def html_path(self): # use prime number to spread across directories From ed0b4bdce3adcb6ff30a068986bdf2465ced5d65 Mon Sep 17 00:00:00 2001 From: Nahue <nahuelhds@gmail.com> Date: Mon, 25 May 2020 19:57:42 -0300 Subject: [PATCH 2/6] Thread creation changed to be based on the default value set by @andresfib at #77, which is not `None` anymore but `''` (cherry picked from commit 69fa1932b6f61f1eba847a0313eacb2ac4d8762c) --- diffengine/twitter.py | 2 +- test_diffengine.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/diffengine/twitter.py b/diffengine/twitter.py index 6c171ff..544ce3d 100644 --- a/diffengine/twitter.py +++ b/diffengine/twitter.py @@ -66,7 +66,7 @@ def tweet_diff(self, diff, token=None, lang={}): # Check if the thread exists thread_status_id_str = None - if diff.old.entry.tweet_status_id_str is None: + if diff.old.entry.tweet_status_id_str == "": try: thread_status_id_str = self.create_thread( diff.old.entry, diff.old, token diff --git a/test_diffengine.py b/test_diffengine.py index e455059..0aeb55e 100644 --- a/test_diffengine.py +++ b/test_diffengine.py @@ -423,7 +423,7 @@ def test_create_thread_if_old_entry_has_no_related_tweet( ): entry = MagicMock() - type(entry).tweet_status_id_str = PropertyMock(return_value=None) + type(entry).tweet_status_id_str = PropertyMock(return_value="") diff = get_mocked_diff() type(diff.old).entry = entry From 2bc4053221ca59ac75130592f1bafddf34e189e9 Mon Sep 17 00:00:00 2001 From: Nahue <nahuelhds@gmail.com> Date: Mon, 25 May 2020 20:18:01 -0300 Subject: [PATCH 3/6] Travis specific chromium-chromedriver version to work with Chrome 81 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 30d011b..0b68eea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ script: py.test before_install: - sudo apt-get -y update - sudo apt-get install firefox-geckodriver - - sudo apt-get install --upgrade chromium-chromedriver + - sudo apt-get install chromium-chromedriver=81.0.4044.138 after_failure: cat test/diffengine.log notifications: slack: From 16b4c33c37d696a091788dde4f4e7b0eb61f0eef Mon Sep 17 00:00:00 2001 From: Nahue <nahuelhds@gmail.com> Date: Mon, 25 May 2020 20:20:13 -0300 Subject: [PATCH 4/6] Travis specific chromium-chromedriver version to work with Chrome 83 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b68eea..00f8e23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ script: py.test before_install: - sudo apt-get -y update - sudo apt-get install firefox-geckodriver - - sudo apt-get install chromium-chromedriver=81.0.4044.138 + - sudo apt-get install chromium-chromedriver=83 after_failure: cat test/diffengine.log notifications: slack: From 475098901638a348754eecf3c0e12f7b1e62f248 Mon Sep 17 00:00:00 2001 From: Nahue <nahuelhds@gmail.com> Date: Mon, 25 May 2020 20:22:55 -0300 Subject: [PATCH 5/6] Travis specific chromium-chromedriver version to work with Chrome 83 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 00f8e23..7854d06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ script: py.test before_install: - sudo apt-get -y update - sudo apt-get install firefox-geckodriver - - sudo apt-get install chromium-chromedriver=83 + - sudo apt-get install chromium-chromedriver after_failure: cat test/diffengine.log notifications: slack: From b0c0d2870308680aa7819041b721e7789f48a056 Mon Sep 17 00:00:00 2001 From: Nahue <nahuelhds@gmail.com> Date: Mon, 25 May 2020 20:38:30 -0300 Subject: [PATCH 6/6] wget for chromedriver 83 --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7854d06..ef8f266 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,10 @@ script: py.test before_install: - sudo apt-get -y update - sudo apt-get install firefox-geckodriver - - sudo apt-get install chromium-chromedriver +before_script: + - wget https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_linux64.zip + - unzip chromedriver_linux64.zip -d /home/travis/virtualenv/python3.7.1/bin/ + - export CHROME_BIN=chromium-browser after_failure: cat test/diffengine.log notifications: slack: